楚江ERP：加工标准合同物料行实体

@@ -167,4 +167,45 @@ create table if not exists  `tbl_contract_distributor_line`
     `update_by`            varchar(20)    not null comment '更新人',
     `update_by`            varchar(20)    not null comment '更新人',
     `create_time`          datetime default now() comment '创建时间',
     `create_time`          datetime default now() comment '创建时间',
     `update_time`          datetime default now() comment '更新时间'
     `update_time`          datetime default now() comment '更新时间'
-)
+)
+
+-- 加工标准合同物料行
+DROP TABLE IF EXISTS `tbl_contract_std_processing_line`;
+create table `tbl_contract_std_processing_line`
+(
+    `id`                             varchar(32) primary key comment 'ID',
+    `contract_id`                    varchar(32)    NOT NULL COMMENT '合同主表ID',
+    `raw_product_id`                 VARCHAR(50) COMMENT '原材料名称',
+    `raw_product_grade`              VARCHAR(100) COMMENT '原材料牌号',
+    `industry`                       VARCHAR(100) COMMENT '行业',
+    `quality`                        VARCHAR(100) COMMENT '品质',
+    `loss_rate`                      VARCHAR(50) COMMENT '损耗',
+    `supply_time`                    DATE COMMENT '提供时间',
+    `material_product_ratio`         VARCHAR(50) COMMENT '原材料与产品数量比',
+    `material_product_ratio_remarks` VARCHAR(100) COMMENT '原材料与产品数量比备注',
+    `product_id`                     VARCHAR(50)    NOT NULL COMMENT '定作物名称',
+    `product_grade`                  VARCHAR(100) COMMENT '定作物牌号',
+    `product_status`                 VARCHAR(100) COMMENT '定作物状态',
+    `product_quantity`               DECIMAL(15, 4) NOT NULL COMMENT '定作物数量',
+    `thickness`                      DECIMAL(10, 4) COMMENT '厚度',
+    `thickness_tol_pos`              DECIMAL(10, 4) COMMENT '厚度公差正',
+    `thickness_tol_neg`              DECIMAL(10, 4) COMMENT '厚度公差负',
+    `width`                          DECIMAL(10, 4) COMMENT '宽度',
+    `width_tol_pos`                  DECIMAL(10, 4) COMMENT '宽度公差正',
+    `width_tol_neg`                  DECIMAL(10, 4) COMMENT '宽度公差负',
+    `length`                         DECIMAL(10, 4) COMMENT '长度',
+    `length_tol_pos`                 DECIMAL(10, 4) COMMENT '长度公差正',
+    `length_tol_neg`                 DECIMAL(10, 4) COMMENT '长度公差负',
+    `unit_price`                     DECIMAL(12, 4) NOT NULL COMMENT '单价',
+    `amount_excluding_tax`           DECIMAL(14, 2) COMMENT '不含税金额',
+    `total_amount`                   DECIMAL(14, 2) NOT NULL COMMENT '总金额',
+    `delivery_date`                  DATE COMMENT '发货日期',
+    `show_order`                     INT      DEFAULT 0 COMMENT '排序',
+    `item_id`                        varchar(50) COMMENT '前端用ID',
+    `create_by_id`                   varchar(32)    not null comment '创建人ID',
+    `create_by`                      varchar(20)    not null comment '创建人',
+    `update_by_id`                   varchar(32)    not null comment '更新人ID',
+    `update_by`                      varchar(20)    not null comment '更新人',
+    `create_time`                    datetime default now() comment '创建时间',
+    `update_time`                    datetime default now() comment '更新时间'
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '加工标准合同物料行' ROW_FORMAT = DYNAMIC;

+package com.lframework.xingyun.sc.bo.contract;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.entity.ContractStdProcessingLine;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 加工标准合同物料行 GetBo
+ * </p>
+ */
+@Data
+public class GetContractStdProcessingLineBo extends BaseBo<ContractStdProcessingLine> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 合同主表ID
+     */
+    @ApiModelProperty("合同主表ID")
+    private String contractId;
+
+    /**
+     * 原材料名称
+     */
+    @ApiModelProperty("原材料名称")
+    private String rawProductId;
+
+    /**
+     * 原材料名称
+     */
+    @ApiModelProperty("原材料名称")
+    private String rawProductName;
+
+    /**
+     * 原材料牌号
+     */
+    @ApiModelProperty("原材料牌号")
+    private String rawProductGrade;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    private String industry;
+
+    /**
+     * 品质
+     */
+    @ApiModelProperty("品质")
+    private String quality;
+
+    /**
+     * 损耗
+     */
+    @ApiModelProperty("损耗")
+    private String lossRate;
+
+    /**
+     * 提供时间
+     */
+    @ApiModelProperty("提供时间")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate supplyTime;
+
+    /**
+     * 原材料与产品数量比
+     */
+    @ApiModelProperty("原材料与产品数量比")
+    private String materialProductRatio;
+
+    /**
+     * 原材料与产品数量比
+     */
+    @ApiModelProperty("原材料与产品数量比")
+    private String materialProductRatioName;
+
+    /**
+     * 原材料与产品数量比备注
+     */
+    @ApiModelProperty("原材料与产品数量比备注")
+    private String materialProductRatioRemarks;
+
+    /**
+     * 定作物名称
+     */
+    @ApiModelProperty("定作物名称")
+    private String productId;
+
+    /**
+     * 定作物名称
+     */
+    @ApiModelProperty("定作物名称")
+    private String productName;
+
+    /**
+     * 定作物牌号
+     */
+    @ApiModelProperty("定作物牌号")
+    private String productGrade;
+
+    /**
+     * 定作物状态
+     */
+    @ApiModelProperty("定作物状态")
+    private String productStatus;
+
+    /**
+     * 定作物数量
+     */
+    @ApiModelProperty("定作物数量")
+    private BigDecimal productQuantity;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 单价
+     */
+    @ApiModelProperty("单价")
+    private BigDecimal unitPrice;
+
+    /**
+     * 不含税金额
+     */
+    @ApiModelProperty("不含税金额")
+    private BigDecimal amountExcludingTax;
+
+    /**
+     * 总金额
+     */
+    @ApiModelProperty("总金额")
+    private BigDecimal totalAmount;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate deliveryDate;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    private Integer showOrder;
+
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty("前端用ID")
+    private String itemId;
+
+    public GetContractStdProcessingLineBo() {
+
+    }
+
+    public GetContractStdProcessingLineBo(ContractStdProcessingLine dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ContractStdProcessingLine> convert(ContractStdProcessingLine dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(ContractStdProcessingLine dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.math.BigDecimal;
+
+import com.lframework.starter.web.core.dto.BaseDto;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * <p>
+ * 加工标准合同物料行
+ * </p>
+ */
+@Data
+@TableName("tbl_contract_std_processing_line")
+public class ContractStdProcessingLine extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "ContractStdProcessingLine";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 合同主表ID
+     */
+    private String contractId;
+
+    /**
+     * 原材料名称
+     */
+    private String rawProductId;
+
+    /**
+     * 原材料牌号
+     */
+    private String rawProductGrade;
+
+    /**
+     * 行业
+     */
+    private String industry;
+
+    /**
+     * 品质
+     */
+    private String quality;
+
+    /**
+     * 损耗
+     */
+    private String lossRate;
+
+    /**
+     * 提供时间
+     */
+    private LocalDate supplyTime;
+
+    /**
+     * 原材料与产品数量比
+     */
+    private String materialProductRatio;
+
+    /**
+     * 原材料与产品数量比备注
+     */
+    private String materialProductRatioRemarks;
+
+    /**
+     * 定作物名称
+     */
+    private String productId;
+
+    /**
+     * 定作物牌号
+     */
+    private String productGrade;
+
+    /**
+     * 定作物状态
+     */
+    private String productStatus;
+
+    /**
+     * 定作物数量
+     */
+    private BigDecimal productQuantity;
+
+    /**
+     * 厚度
+     */
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 单价
+     */
+    private BigDecimal unitPrice;
+
+    /**
+     * 不含税金额
+     */
+    private BigDecimal amountExcludingTax;
+
+    /**
+     * 总金额
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 发货日期
+     */
+    private LocalDate deliveryDate;
+
+    /**
+     * 排序
+     */
+    private Integer showOrder;
+
+    /**
+     * 前端用ID
+     */
+    private String itemId;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 更新人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+}

@@ -303,6 +303,8 @@ public class ContractDistributorStandardServiceImpl extends
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
 
 
+        clearChildContractDistributorStandardCache(vo.getId());
+
         data.setFormalFileId(vo.getFormalFileId());
         data.setFormalFileId(vo.getFormalFileId());
         data.setFormalFileName(vo.getFormalFileName());
         data.setFormalFileName(vo.getFormalFileName());
         data.setFormalStandardized(vo.getFormalStandardized());
         data.setFormalStandardized(vo.getFormalStandardized());
@@ -311,6 +313,20 @@ public class ContractDistributorStandardServiceImpl extends
         flowInstanceWrapperService.startInstance(FORMAL_FLAG, data.getId(), FORMAL_FLAG, data);
         flowInstanceWrapperService.startInstance(FORMAL_FLAG, data.getId(), FORMAL_FLAG, data);
     }
     }
 
 
+    private void clearChildContractDistributorStandardCache(String id) {
+        if (StringUtils.isBlank(id)) {
+            return;
+        }
+
+        Wrapper<ContractDistributorStandard> childWrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
+                .eq(ContractDistributorStandard::getParentId, id);
+
+        List<ContractDistributorStandard> childList = getBaseMapper().selectList(childWrapper);
+        CollectionUtils.emptyIfNull(childList).forEach(contractDistributorStandard -> {
+            cleanCacheByKey(contractDistributorStandard.getId());
+        });
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "上传标准合同附件，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "上传标准合同附件，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
@@ -374,6 +390,7 @@ public class ContractDistributorStandardServiceImpl extends
         OpLogUtil.setExtra(vo);
         OpLogUtil.setExtra(vo);
 
 
         cleanCacheByKey(id);
         cleanCacheByKey(id);
+        clearChildContractDistributorStandardCache(id);
     }
     }
 
 
     @Override
     @Override

+package com.lframework.xingyun.sc.impl.contract;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.ContractStdProcessingLine;
+import com.lframework.xingyun.sc.mappers.ContractStdProcessingLineMapper;
+import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
+import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractStdProcessingLineVo;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractStdProcessingLineVo;
+import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractStdProcessingLineVo;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Service
+public class ContractStdProcessingLineServiceImpl extends BaseMpServiceImpl<ContractStdProcessingLineMapper, ContractStdProcessingLine> implements ContractStdProcessingLineService {
+
+    @Override
+    public PageResult<ContractStdProcessingLine> query(Integer pageIndex, Integer pageSize, QueryContractStdProcessingLineVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<ContractStdProcessingLine> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<ContractStdProcessingLine> query(QueryContractStdProcessingLineVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Cacheable(value = ContractStdProcessingLine.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
+    @Override
+    public ContractStdProcessingLine findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增加工标准合同物料行，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateContractStdProcessingLineVo vo) {
+
+        ContractStdProcessingLine data = new ContractStdProcessingLine();
+        data.setId(IdUtil.getUUID());
+        if (!StringUtil.isBlank(vo.getContractId())) {
+            data.setContractId(vo.getContractId());
+        }
+        if (!StringUtil.isBlank(vo.getRawProductId())) {
+            data.setRawProductId(vo.getRawProductId());
+        }
+        if (!StringUtil.isBlank(vo.getRawProductGrade())) {
+            data.setRawProductGrade(vo.getRawProductGrade());
+        }
+        if (!StringUtil.isBlank(vo.getIndustry())) {
+            data.setIndustry(vo.getIndustry());
+        }
+        if (!StringUtil.isBlank(vo.getQuality())) {
+            data.setQuality(vo.getQuality());
+        }
+        if (!StringUtil.isBlank(vo.getLossRate())) {
+            data.setLossRate(vo.getLossRate());
+        }
+        if (vo.getSupplyTime() != null) {
+            data.setSupplyTime(vo.getSupplyTime());
+        }
+        if (!StringUtil.isBlank(vo.getMaterialProductRatio())) {
+            data.setMaterialProductRatio(vo.getMaterialProductRatio());
+        }
+        if (!StringUtil.isBlank(vo.getMaterialProductRatioRemarks())) {
+            data.setMaterialProductRatioRemarks(vo.getMaterialProductRatioRemarks());
+        }
+        if (!StringUtil.isBlank(vo.getProductId())) {
+            data.setProductId(vo.getProductId());
+        }
+        if (!StringUtil.isBlank(vo.getProductGrade())) {
+            data.setProductGrade(vo.getProductGrade());
+        }
+        if (!StringUtil.isBlank(vo.getProductStatus())) {
+            data.setProductStatus(vo.getProductStatus());
+        }
+        if (vo.getProductQuantity() != null) {
+            data.setProductQuantity(vo.getProductQuantity());
+        }
+        if (vo.getThickness() != null) {
+            data.setThickness(vo.getThickness());
+        }
+        if (vo.getThicknessTolPos() != null) {
+            data.setThicknessTolPos(vo.getThicknessTolPos());
+        }
+        if (vo.getThicknessTolNeg() != null) {
+            data.setThicknessTolNeg(vo.getThicknessTolNeg());
+        }
+        if (vo.getWidth() != null) {
+            data.setWidth(vo.getWidth());
+        }
+        if (vo.getWidthTolPos() != null) {
+            data.setWidthTolPos(vo.getWidthTolPos());
+        }
+        if (vo.getWidthTolNeg() != null) {
+            data.setWidthTolNeg(vo.getWidthTolNeg());
+        }
+        if (vo.getLength() != null) {
+            data.setLength(vo.getLength());
+        }
+        if (vo.getLengthTolPos() != null) {
+            data.setLengthTolPos(vo.getLengthTolPos());
+        }
+        if (vo.getLengthTolNeg() != null) {
+            data.setLengthTolNeg(vo.getLengthTolNeg());
+        }
+        if (vo.getUnitPrice() != null) {
+            data.setUnitPrice(vo.getUnitPrice());
+        }
+        if (vo.getAmountExcludingTax() != null) {
+            data.setAmountExcludingTax(vo.getAmountExcludingTax());
+        }
+        if (vo.getTotalAmount() != null) {
+            data.setTotalAmount(vo.getTotalAmount());
+        }
+        if (vo.getDeliveryDate() != null) {
+            data.setDeliveryDate(vo.getDeliveryDate());
+        }
+        if (vo.getShowOrder() != null) {
+            data.setShowOrder(vo.getShowOrder());
+        }
+        if (!StringUtil.isBlank(vo.getItemId())) {
+            data.setItemId(vo.getItemId());
+        }
+
+        getBaseMapper().insert(data);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        return data.getId();
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改加工标准合同物料行，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateContractStdProcessingLineVo vo) {
+
+        ContractStdProcessingLine data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("加工标准合同物料行不存在！");
+        }
+
+        LambdaUpdateWrapper<ContractStdProcessingLine> updateWrapper = Wrappers.lambdaUpdate(ContractStdProcessingLine.class)
+                .set(ContractStdProcessingLine::getContractId, StringUtil.isBlank(vo.getContractId()) ? null : vo.getContractId())
+                .set(ContractStdProcessingLine::getRawProductId, StringUtil.isBlank(vo.getRawProductId()) ? null : vo.getRawProductId())
+                .set(ContractStdProcessingLine::getRawProductGrade, StringUtil.isBlank(vo.getRawProductGrade()) ? null : vo.getRawProductGrade())
+                .set(ContractStdProcessingLine::getIndustry, StringUtil.isBlank(vo.getIndustry()) ? null : vo.getIndustry())
+                .set(ContractStdProcessingLine::getQuality, StringUtil.isBlank(vo.getQuality()) ? null : vo.getQuality())
+                .set(ContractStdProcessingLine::getLossRate, StringUtil.isBlank(vo.getLossRate()) ? null : vo.getLossRate())
+                .set(ContractStdProcessingLine::getSupplyTime, vo.getSupplyTime() == null ? null : vo.getSupplyTime())
+                .set(ContractStdProcessingLine::getMaterialProductRatio, StringUtil.isBlank(vo.getMaterialProductRatio()) ? null : vo.getMaterialProductRatio())
+                .set(ContractStdProcessingLine::getMaterialProductRatioRemarks, StringUtil.isBlank(vo.getMaterialProductRatioRemarks()) ? null : vo.getMaterialProductRatioRemarks())
+                .set(ContractStdProcessingLine::getProductId, StringUtil.isBlank(vo.getProductId()) ? null : vo.getProductId())
+                .set(ContractStdProcessingLine::getProductGrade, StringUtil.isBlank(vo.getProductGrade()) ? null : vo.getProductGrade())
+                .set(ContractStdProcessingLine::getProductStatus, StringUtil.isBlank(vo.getProductStatus()) ? null : vo.getProductStatus())
+                .set(ContractStdProcessingLine::getProductQuantity, vo.getProductQuantity() == null ? null : vo.getProductQuantity())
+                .set(ContractStdProcessingLine::getThickness, vo.getThickness() == null ? null : vo.getThickness())
+                .set(ContractStdProcessingLine::getThicknessTolPos, vo.getThicknessTolPos() == null ? null : vo.getThicknessTolPos())
+                .set(ContractStdProcessingLine::getThicknessTolNeg, vo.getThicknessTolNeg() == null ? null : vo.getThicknessTolNeg())
+                .set(ContractStdProcessingLine::getWidth, vo.getWidth() == null ? null : vo.getWidth())
+                .set(ContractStdProcessingLine::getWidthTolPos, vo.getWidthTolPos() == null ? null : vo.getWidthTolPos())
+                .set(ContractStdProcessingLine::getWidthTolNeg, vo.getWidthTolNeg() == null ? null : vo.getWidthTolNeg())
+                .set(ContractStdProcessingLine::getLength, vo.getLength() == null ? null : vo.getLength())
+                .set(ContractStdProcessingLine::getLengthTolPos, vo.getLengthTolPos() == null ? null : vo.getLengthTolPos())
+                .set(ContractStdProcessingLine::getLengthTolNeg, vo.getLengthTolNeg() == null ? null : vo.getLengthTolNeg())
+                .set(ContractStdProcessingLine::getUnitPrice, vo.getUnitPrice() == null ? null : vo.getUnitPrice())
+                .set(ContractStdProcessingLine::getAmountExcludingTax, vo.getAmountExcludingTax() == null ? null : vo.getAmountExcludingTax())
+                .set(ContractStdProcessingLine::getTotalAmount, vo.getTotalAmount() == null ? null : vo.getTotalAmount())
+                .set(ContractStdProcessingLine::getDeliveryDate, vo.getDeliveryDate() == null ? null : vo.getDeliveryDate())
+                .set(ContractStdProcessingLine::getShowOrder, vo.getShowOrder() == null ? null : vo.getShowOrder())
+                .set(ContractStdProcessingLine::getItemId, StringUtil.isBlank(vo.getItemId()) ? null : vo.getItemId())
+                .eq(ContractStdProcessingLine::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
+    @CacheEvict(value = ContractStdProcessingLine.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
+    @Override
+    public void cleanCacheByKey(Serializable key) {
+
+    }
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.ContractStdProcessingLine;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractStdProcessingLineVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 加工标准合同物料行 Mapper 接口
+ * </p>
+ *
+ */
+public interface ContractStdProcessingLineMapper extends BaseMapper<ContractStdProcessingLine> {
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<ContractStdProcessingLine> query(@Param("vo") QueryContractStdProcessingLineVo vo);
+}

+package com.lframework.xingyun.sc.service.contract;
+
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.xingyun.sc.entity.ContractStdProcessingLine;
+import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractStdProcessingLineVo;
+import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractStdProcessingLineVo;
+import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractStdProcessingLineVo;
+
+import java.util.List;
+
+/**
+ * 加工标准合同物料行 Service
+ */
+public interface ContractStdProcessingLineService extends BaseMpService<ContractStdProcessingLine> {
+
+    /**
+     * 查询列表
+     *
+     * @return
+     */
+    PageResult<ContractStdProcessingLine> query(Integer pageIndex, Integer pageSize, QueryContractStdProcessingLineVo vo);
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<ContractStdProcessingLine> query(QueryContractStdProcessingLineVo vo);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id
+     * @return
+     */
+    ContractStdProcessingLine findById(String id);
+
+    /**
+     * 创建
+     *
+     * @param vo
+     * @return
+     */
+    String create(CreateContractStdProcessingLineVo vo);
+
+    /**
+     * 修改
+     *
+     * @param vo
+     */
+    void update(UpdateContractStdProcessingLineVo vo);
+
+}

+package com.lframework.xingyun.sc.vo.contract.createVo;
+
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+public class CreateContractStdProcessingLineVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 合同主表ID
+     */
+    @ApiModelProperty("合同主表ID")
+    @Length(message = "合同主表ID最多允许32个字符！")
+    private String contractId;
+
+    /**
+     * 原材料名称
+     */
+    @ApiModelProperty("原材料名称")
+    @Length(message = "原材料名称最多允许50个字符！")
+    private String rawProductId;
+
+    /**
+     * 原材料牌号
+     */
+    @ApiModelProperty("原材料牌号")
+    @Length(message = "原材料牌号最多允许100个字符！")
+    private String rawProductGrade;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    @Length(message = "行业最多允许100个字符！")
+    private String industry;
+
+    /**
+     * 品质
+     */
+    @ApiModelProperty("品质")
+    @Length(message = "品质最多允许100个字符！")
+    private String quality;
+
+    /**
+     * 损耗
+     */
+    @ApiModelProperty("损耗")
+    @Length(message = "损耗最多允许50个字符！")
+    private String lossRate;
+
+    /**
+     * 提供时间
+     */
+    @ApiModelProperty("提供时间")
+    @TypeMismatch(message = "提供时间格式有误！")
+    private LocalDate supplyTime;
+
+    /**
+     * 原材料与产品数量比
+     */
+    @ApiModelProperty("原材料与产品数量比")
+    @Length(message = "原材料与产品数量比最多允许50个字符！")
+    private String materialProductRatio;
+
+    /**
+     * 原材料与产品数量比备注
+     */
+    @ApiModelProperty("原材料与产品数量比备注")
+    @Length(message = "原材料与产品数量比备注最多允许100个字符！")
+    private String materialProductRatioRemarks;
+
+    /**
+     * 定作物名称
+     */
+    @ApiModelProperty("定作物名称")
+    @Length(message = "定作物名称最多允许50个字符！")
+    private String productId;
+
+    /**
+     * 定作物牌号
+     */
+    @ApiModelProperty("定作物牌号")
+    @Length(message = "定作物牌号最多允许100个字符！")
+    private String productGrade;
+
+    /**
+     * 定作物状态
+     */
+    @ApiModelProperty("定作物状态")
+    @Length(message = "定作物状态最多允许100个字符！")
+    private String productStatus;
+
+    /**
+     * 定作物数量
+     */
+    @ApiModelProperty("定作物数量")
+    @TypeMismatch(message = "定作物数量格式有误！")
+    @IsNumberPrecision(message = "定作物数量最多允许4位小数！", value = 4)
+    private BigDecimal productQuantity;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    @TypeMismatch(message = "厚度格式有误！")
+    @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4)
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    @TypeMismatch(message = "厚度公差正格式有误！")
+    @IsNumberPrecision(message = "厚度公差正最多允许4位小数！", value = 4)
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    @TypeMismatch(message = "厚度公差负格式有误！")
+    @IsNumberPrecision(message = "厚度公差负最多允许4位小数！", value = 4)
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    @TypeMismatch(message = "宽度格式有误！")
+    @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4)
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    @TypeMismatch(message = "宽度公差正格式有误！")
+    @IsNumberPrecision(message = "宽度公差正最多允许4位小数！", value = 4)
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    @TypeMismatch(message = "宽度公差负格式有误！")
+    @IsNumberPrecision(message = "宽度公差负最多允许4位小数！", value = 4)
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    @TypeMismatch(message = "长度格式有误！")
+    @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4)
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    @TypeMismatch(message = "长度公差正格式有误！")
+    @IsNumberPrecision(message = "长度公差正最多允许4位小数！", value = 4)
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    @TypeMismatch(message = "长度公差负格式有误！")
+    @IsNumberPrecision(message = "长度公差负最多允许4位小数！", value = 4)
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 单价
+     */
+    @ApiModelProperty("单价")
+    @TypeMismatch(message = "单价格式有误！")
+    @IsNumberPrecision(message = "单价最多允许4位小数！", value = 4)
+    private BigDecimal unitPrice;
+
+    /**
+     * 不含税金额
+     */
+    @ApiModelProperty("不含税金额")
+    @TypeMismatch(message = "不含税金额格式有误！")
+    @IsNumberPrecision(message = "不含税金额最多允许2位小数！", value = 2)
+    private BigDecimal amountExcludingTax;
+
+    /**
+     * 总金额
+     */
+    @ApiModelProperty("总金额")
+    @TypeMismatch(message = "总金额格式有误！")
+    @IsNumberPrecision(message = "总金额最多允许2位小数！", value = 2)
+    private BigDecimal totalAmount;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @TypeMismatch(message = "发货日期格式有误！")
+    private LocalDate deliveryDate;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    @TypeMismatch(message = "排序格式有误！")
+    private Integer showOrder;
+
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty("前端用ID")
+    @Length(message = "前端用ID最多允许50个字符！")
+    private String itemId;
+
+}
+

+package com.lframework.xingyun.sc.vo.contract.queryVo;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class QueryContractStdProcessingLineVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 合同主表ID
+     */
+    @ApiModelProperty("合同主表ID")
+    private String contractId;
+
+}

+package com.lframework.xingyun.sc.vo.contract.updateVo;
+
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+public class UpdateContractStdProcessingLineVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 合同主表ID
+     */
+    @ApiModelProperty("合同主表ID")
+    @Length(message = "合同主表ID最多允许32个字符！")
+    private String contractId;
+
+    /**
+     * 原材料名称
+     */
+    @ApiModelProperty("原材料名称")
+    @Length(message = "原材料名称最多允许50个字符！")
+    private String rawProductId;
+
+    /**
+     * 原材料牌号
+     */
+    @ApiModelProperty("原材料牌号")
+    @Length(message = "原材料牌号最多允许100个字符！")
+    private String rawProductGrade;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    @Length(message = "行业最多允许100个字符！")
+    private String industry;
+
+    /**
+     * 品质
+     */
+    @ApiModelProperty("品质")
+    @Length(message = "品质最多允许100个字符！")
+    private String quality;
+
+    /**
+     * 损耗
+     */
+    @ApiModelProperty("损耗")
+    @Length(message = "损耗最多允许50个字符！")
+    private String lossRate;
+
+    /**
+     * 提供时间
+     */
+    @ApiModelProperty("提供时间")
+    @TypeMismatch(message = "提供时间格式有误！")
+    private LocalDate supplyTime;
+
+    /**
+     * 原材料与产品数量比
+     */
+    @ApiModelProperty("原材料与产品数量比")
+    @Length(message = "原材料与产品数量比最多允许50个字符！")
+    private String materialProductRatio;
+
+    /**
+     * 原材料与产品数量比备注
+     */
+    @ApiModelProperty("原材料与产品数量比备注")
+    @Length(message = "原材料与产品数量比备注最多允许100个字符！")
+    private String materialProductRatioRemarks;
+
+    /**
+     * 定作物名称
+     */
+    @ApiModelProperty("定作物名称")
+    @Length(message = "定作物名称最多允许50个字符！")
+    private String productId;
+
+    /**
+     * 定作物牌号
+     */
+    @ApiModelProperty("定作物牌号")
+    @Length(message = "定作物牌号最多允许100个字符！")
+    private String productGrade;
+
+    /**
+     * 定作物状态
+     */
+    @ApiModelProperty("定作物状态")
+    @Length(message = "定作物状态最多允许100个字符！")
+    private String productStatus;
+
+    /**
+     * 定作物数量
+     */
+    @ApiModelProperty("定作物数量")
+    @TypeMismatch(message = "定作物数量格式有误！")
+    @IsNumberPrecision(message = "定作物数量最多允许4位小数！", value = 4)
+    private BigDecimal productQuantity;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    @TypeMismatch(message = "厚度格式有误！")
+    @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4)
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    @TypeMismatch(message = "厚度公差正格式有误！")
+    @IsNumberPrecision(message = "厚度公差正最多允许4位小数！", value = 4)
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    @TypeMismatch(message = "厚度公差负格式有误！")
+    @IsNumberPrecision(message = "厚度公差负最多允许4位小数！", value = 4)
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    @TypeMismatch(message = "宽度格式有误！")
+    @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4)
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    @TypeMismatch(message = "宽度公差正格式有误！")
+    @IsNumberPrecision(message = "宽度公差正最多允许4位小数！", value = 4)
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    @TypeMismatch(message = "宽度公差负格式有误！")
+    @IsNumberPrecision(message = "宽度公差负最多允许4位小数！", value = 4)
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    @TypeMismatch(message = "长度格式有误！")
+    @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4)
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    @TypeMismatch(message = "长度公差正格式有误！")
+    @IsNumberPrecision(message = "长度公差正最多允许4位小数！", value = 4)
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    @TypeMismatch(message = "长度公差负格式有误！")
+    @IsNumberPrecision(message = "长度公差负最多允许4位小数！", value = 4)
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 单价
+     */
+    @ApiModelProperty("单价")
+    @TypeMismatch(message = "单价格式有误！")
+    @IsNumberPrecision(message = "单价最多允许4位小数！", value = 4)
+    private BigDecimal unitPrice;
+
+    /**
+     * 不含税金额
+     */
+    @ApiModelProperty("不含税金额")
+    @TypeMismatch(message = "不含税金额格式有误！")
+    @IsNumberPrecision(message = "不含税金额最多允许2位小数！", value = 2)
+    private BigDecimal amountExcludingTax;
+
+    /**
+     * 总金额
+     */
+    @ApiModelProperty("总金额")
+    @TypeMismatch(message = "总金额格式有误！")
+    @IsNumberPrecision(message = "总金额最多允许2位小数！", value = 2)
+    private BigDecimal totalAmount;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @TypeMismatch(message = "发货日期格式有误！")
+    private LocalDate deliveryDate;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    @TypeMismatch(message = "排序格式有误！")
+    private Integer showOrder;
+
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty("前端用ID")
+    @Length(message = "前端用ID最多允许50个字符！")
+    private String itemId;
+
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lframework.xingyun.sc.mappers.ContractStdProcessingLineMapper">
+
+    <resultMap id="ContractStdProcessingLine" type="com.lframework.xingyun.sc.entity.ContractStdProcessingLine">
+        <id column="id" property="id"/>
+        <result column="contract_id" property="contractId"/>
+        <result column="raw_product_id" property="rawProductId"/>
+        <result column="raw_product_grade" property="rawProductGrade"/>
+        <result column="industry" property="industry"/>
+        <result column="quality" property="quality"/>
+        <result column="loss_rate" property="lossRate"/>
+        <result column="supply_time" property="supplyTime"/>
+        <result column="material_product_ratio" property="materialProductRatio"/>
+        <result column="material_product_ratio_remarks" property="materialProductRatioRemarks"/>
+        <result column="product_id" property="productId"/>
+        <result column="product_grade" property="productGrade"/>
+        <result column="product_status" property="productStatus"/>
+        <result column="product_quantity" property="productQuantity"/>
+        <result column="thickness" property="thickness"/>
+        <result column="thickness_tol_pos" property="thicknessTolPos"/>
+        <result column="thickness_tol_neg" property="thicknessTolNeg"/>
+        <result column="width" property="width"/>
+        <result column="width_tol_pos" property="widthTolPos"/>
+        <result column="width_tol_neg" property="widthTolNeg"/>
+        <result column="length" property="length"/>
+        <result column="length_tol_pos" property="lengthTolPos"/>
+        <result column="length_tol_neg" property="lengthTolNeg"/>
+        <result column="unit_price" property="unitPrice"/>
+        <result column="amount_excluding_tax" property="amountExcludingTax"/>
+        <result column="total_amount" property="totalAmount"/>
+        <result column="delivery_date" property="deliveryDate"/>
+        <result column="show_order" property="showOrder"/>
+        <result column="item_id" property="itemId"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="ContractStdProcessingLine_sql">
+        SELECT
+            tb.id,
+            tb.contract_id,
+            tb.raw_product_id,
+            tb.raw_product_grade,
+            tb.industry,
+            tb.quality,
+            tb.loss_rate,
+            tb.supply_time,
+            tb.material_product_ratio,
+            tb.material_product_ratio_remarks,
+            tb.product_id,
+            tb.product_grade,
+            tb.product_status,
+            tb.product_quantity,
+            tb.thickness,
+            tb.thickness_tol_pos,
+            tb.thickness_tol_neg,
+            tb.width,
+            tb.width_tol_pos,
+            tb.width_tol_neg,
+            tb.length,
+            tb.length_tol_pos,
+            tb.length_tol_neg,
+            tb.unit_price,
+            tb.amount_excluding_tax,
+            tb.total_amount,
+            tb.delivery_date,
+            tb.show_order,
+            tb.item_id,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM tbl_contract_std_processing_line AS tb
+    </sql>
+
+    <select id="query" resultMap="ContractStdProcessingLine">
+        <include refid="ContractStdProcessingLine_sql"/>
+        <where>
+            <if test="vo.contractId != null and vo.contractId != ''">
+                AND tb.contract_id = #{vo.contractId}
+            </if>
+        </where>
+    </select>
+</mapper>