合同：新增物料编码

@@ -1430,3 +1430,11 @@ create table if not exists shipments_detail_statistics(
 alter table shipments_order_info add column code varchar(50) comment '发货单编号';
 alter table shipments_order_info add column code varchar(50) comment '发货单编号';
 alter table shipments_order_info add column on_time_shipment bool default null comment '是否当日发货';
 alter table shipments_order_info add column on_time_shipment bool default null comment '是否当日发货';
 alter table shipments_order_info add column new_shipment_date date default null comment '新发货日期';
 alter table shipments_order_info add column new_shipment_date date default null comment '新发货日期';
+
+
+ALTER TABLE tbl_contract_distributor_line
+    ADD COLUMN material_code varchar(100) COMMENT '物料编码';
+
+ALTER TABLE tbl_contract_std_processing_line
+    ADD COLUMN material_code varchar(100) COMMENT '物料编码';
+

@@ -177,6 +177,12 @@ public class GetContractDistributorLineBo extends BaseBo<ContractDistributorLine
     @ApiModelProperty(value = "是否为试样订单")
     @ApiModelProperty(value = "是否为试样订单")
     private Boolean sampleOrder;
     private Boolean sampleOrder;
 
 
+    /**
+     * 物料编码
+     */
+    @ApiModelProperty(value = "物料编码")
+    private String materialCode;
+
     public GetContractDistributorLineBo() {
     public GetContractDistributorLineBo() {
 
 
     }
     }

@@ -223,6 +223,12 @@ public class GetContractStdProcessingLineBo extends BaseBo<ContractStdProcessing
     @ApiModelProperty(value = "是否为试样订单")
     @ApiModelProperty(value = "是否为试样订单")
     private Boolean sampleOrder;
     private Boolean sampleOrder;
 
 
+    /**
+     * 物料编码
+     */
+    @ApiModelProperty(value = "物料编码")
+    private String materialCode;
+
     public GetContractStdProcessingLineBo() {
     public GetContractStdProcessingLineBo() {
 
 
     }
     }

@@ -1099,21 +1099,22 @@ public class ContractDistributorStandardController extends DefaultBaseController
                                 LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 5);
                                 LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 5);
                             }
                             }
 
 
-                            setCellValue(sheet, startRow, 6, line.getStatus());
-                            setCellValue(sheet, startRow, 7, line.getQuantity());
+                            setCellValue(sheet, startRow, 6, line.getMaterialCode());
+                            setCellValue(sheet, startRow, 7, line.getStatus());
+                            setCellValue(sheet, startRow, 8, line.getQuantity());
 
 
                             if ("INTL_STD_CONTRACT".equals(data.getType())
                             if ("INTL_STD_CONTRACT".equals(data.getType())
                                     || "INTL_INVENTORY_AGMT".equals(data.getType())
                                     || "INTL_INVENTORY_AGMT".equals(data.getType())
                                     || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
                                     || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
-                                setCellValue(sheet, startRow, 9, line.getProcessingFee());
-                                setCellValue(sheet, startRow, 10, line.getUnitPrice());
+                                setCellValue(sheet, startRow, 10, line.getProcessingFee());
+                                setCellValue(sheet, startRow, 11, line.getUnitPrice());
                             } else {
                             } else {
-                                setCellValue(sheet, startRow, 9, line.getUnitPrice());
-                                setCellValue(sheet, startRow, 10, line.getAmountExcludingTax());
+                                setCellValue(sheet, startRow, 10, line.getUnitPrice());
+                                setCellValue(sheet, startRow, 11, line.getAmountExcludingTax());
                             }
                             }
 
 
-                            setCellValue(sheet, startRow, 11, line.getTotalAmount());
-                            setCellValue(sheet, startRow, 12,
+                            setCellValue(sheet, startRow, 12, line.getTotalAmount());
+                            setCellValue(sheet, startRow, 13,
                                     line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : "");
                                     line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : "");
                             startRow++;
                             startRow++;
                         }
                         }
@@ -1142,12 +1143,12 @@ public class ContractDistributorStandardController extends DefaultBaseController
                             if (StringUtils.isNotBlank(latex)) {
                             if (StringUtils.isNotBlank(latex)) {
                                 LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 9);
                                 LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 9);
                             }
                             }
-
-                            setCellValue(sheet, startRow, 10, line.getProductStatus());
-                            setCellValue(sheet, startRow, 11, line.getUnitPrice());
-                            setCellValue(sheet, startRow, 12, line.getAmountExcludingTax());
-                            setCellValue(sheet, startRow, 13, line.getTotalAmount());
-                            setCellValue(sheet, startRow, 14,
+                            setCellValue(sheet, startRow, 10, line.getMaterialCode());
+                            setCellValue(sheet, startRow, 11, line.getProductStatus());
+                            setCellValue(sheet, startRow, 12, line.getUnitPrice());
+                            setCellValue(sheet, startRow, 13, line.getAmountExcludingTax());
+                            setCellValue(sheet, startRow, 14, line.getTotalAmount());
+                            setCellValue(sheet, startRow, 15,
                                     line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : "");
                                     line.getDeliveryDate() != null ? line.getDeliveryDate().format(dateFormatter) : "");
                         }
                         }
                     }
                     }

@@ -186,4 +186,9 @@ public class ContractDistributorLine extends BaseEntity implements BaseDto {
      */
      */
     private BigDecimal lengthTolNeg;
     private BigDecimal lengthTolNeg;
 
 
+    /**
+     * 物料编码
+     */
+    private String materialCode;
+
 }
 }

@@ -178,6 +178,11 @@ public class ContractStdProcessingLine extends BaseEntity implements BaseDto {
     private Boolean sampleOrder;
     private Boolean sampleOrder;
 
 
     /**
     /**
+     * 物料编码
+     */
+    private String materialCode;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.impl.contract;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.xingyun.sc.entity.ContractDistributorLine;
 import com.lframework.xingyun.sc.entity.ContractDistributorLine;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -87,6 +88,9 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
         data.setLengthTolNeg(vo.getLengthTolNeg());
         data.setLengthTolNeg(vo.getLengthTolNeg());
         data.setItemId(vo.getItemId());
         data.setItemId(vo.getItemId());
         data.setSampleOrder(vo.getSampleOrder());
         data.setSampleOrder(vo.getSampleOrder());
+        if (!StringUtil.isBlank(vo.getMaterialCode())) {
+            data.setMaterialCode(vo.getMaterialCode());
+        }
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
@@ -131,6 +135,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
                 .set(ContractDistributorLine::getLengthTolNeg, vo.getLengthTolNeg())
                 .set(ContractDistributorLine::getLengthTolNeg, vo.getLengthTolNeg())
                 .set(ContractDistributorLine::getItemId, vo.getItemId())
                 .set(ContractDistributorLine::getItemId, vo.getItemId())
                 .set(ContractDistributorLine::getSampleOrder, vo.getSampleOrder())
                 .set(ContractDistributorLine::getSampleOrder, vo.getSampleOrder())
+                .set(ContractDistributorLine::getMaterialCode, vo.getMaterialCode())
                 .eq(ContractDistributorLine::getId, vo.getId());
                 .eq(ContractDistributorLine::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);

@@ -148,6 +148,9 @@ public class ContractStdProcessingLineServiceImpl extends BaseMpServiceImpl<Cont
             data.setItemId(vo.getItemId());
             data.setItemId(vo.getItemId());
         }
         }
         data.setSampleOrder(vo.getSampleOrder());
         data.setSampleOrder(vo.getSampleOrder());
+        if (!StringUtil.isBlank(vo.getMaterialCode())) {
+            data.setMaterialCode(vo.getMaterialCode());
+        }
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
@@ -197,6 +200,7 @@ public class ContractStdProcessingLineServiceImpl extends BaseMpServiceImpl<Cont
                 .set(ContractStdProcessingLine::getShowOrder, vo.getShowOrder() == null ? null : vo.getShowOrder())
                 .set(ContractStdProcessingLine::getShowOrder, vo.getShowOrder() == null ? null : vo.getShowOrder())
                 .set(ContractStdProcessingLine::getItemId, StringUtil.isBlank(vo.getItemId()) ? null : vo.getItemId())
                 .set(ContractStdProcessingLine::getItemId, StringUtil.isBlank(vo.getItemId()) ? null : vo.getItemId())
                 .set(ContractStdProcessingLine::getSampleOrder, vo.getSampleOrder())
                 .set(ContractStdProcessingLine::getSampleOrder, vo.getSampleOrder())
+                .set(ContractStdProcessingLine::getMaterialCode, vo.getMaterialCode() == null ? null : vo.getMaterialCode())
                 .eq(ContractStdProcessingLine::getId, vo.getId());
                 .eq(ContractStdProcessingLine::getId, vo.getId());
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);

@@ -197,4 +197,10 @@ public class CreateContractDistributorLineVo implements BaseVo, Serializable {
      */
      */
     @ApiModelProperty(value = "是否为试样订单")
     @ApiModelProperty(value = "是否为试样订单")
     private Boolean sampleOrder;
     private Boolean sampleOrder;
+
+    /**
+     * 物料编码
+     */
+    @ApiModelProperty(value = "物料编码")
+    private String materialCode;
 }
 }

@@ -230,5 +230,11 @@ public class CreateContractStdProcessingLineVo implements BaseVo, Serializable {
     @ApiModelProperty(value = "是否为试样订单")
     @ApiModelProperty(value = "是否为试样订单")
     private Boolean sampleOrder;
     private Boolean sampleOrder;
 
 
+    /**
+     * 物料编码
+     */
+    @ApiModelProperty(value = "物料编码")
+    private String materialCode;
+
 }
 }
 
 

@@ -200,5 +200,11 @@ public class UpdateContractDistributorLineVo implements BaseVo, Serializable {
      */
      */
     @ApiModelProperty(value = "是否为试样订单")
     @ApiModelProperty(value = "是否为试样订单")
     private Boolean sampleOrder;
     private Boolean sampleOrder;
+
+    /**
+     * 物料编码
+     */
+    @ApiModelProperty(value = "物料编码")
+    private String materialCode;
 }
 }
 
 

@@ -238,5 +238,9 @@ public class UpdateContractStdProcessingLineVo implements BaseVo, Serializable {
     @ApiModelProperty(value = "是否为试样订单")
     @ApiModelProperty(value = "是否为试样订单")
     private Boolean sampleOrder;
     private Boolean sampleOrder;
 
 
-
+    /**
+     * 物料编码
+     */
+    @ApiModelProperty(value = "物料编码")
+    private String materialCode;
 }
 }

@@ -34,6 +34,7 @@
         <result column="length_tol_neg" property="lengthTolNeg"/>
         <result column="length_tol_neg" property="lengthTolNeg"/>
         <result column="item_id" property="itemId"/>
         <result column="item_id" property="itemId"/>
         <result column="sample_order" property="sampleOrder"/>
         <result column="sample_order" property="sampleOrder"/>
+        <result column="material_code" property="materialCode"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="ContractDistributorLine_sql">
     <sql id="ContractDistributorLine_sql">
@@ -67,7 +68,8 @@
                tb.length_tol_pos,
                tb.length_tol_pos,
                tb.length_tol_neg,
                tb.length_tol_neg,
                tb.item_id,
                tb.item_id,
-               tb.sample_order
+               tb.sample_order,
+               tb.material_code
         FROM tbl_contract_distributor_line AS tb
         FROM tbl_contract_distributor_line AS tb
     </sql>
     </sql>
 
 

@@ -39,6 +39,7 @@
         <result column="update_by" property="updateBy"/>
         <result column="update_by" property="updateBy"/>
         <result column="create_time" property="createTime"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="update_time" property="updateTime"/>
+        <result column="material_code" property="materialCode"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="ContractStdProcessingLine_sql">
     <sql id="ContractStdProcessingLine_sql">
@@ -78,7 +79,8 @@
             tb.update_by_id,
             tb.update_by_id,
             tb.update_by,
             tb.update_by,
             tb.create_time,
             tb.create_time,
-            tb.update_time
+            tb.update_time,
+            tb.material_code
         FROM tbl_contract_std_processing_line AS tb
         FROM tbl_contract_std_processing_line AS tb
     </sql>
     </sql>