Merge branch 'master_cj_zq' into master_sample_order

# Conflicts:
#	xingyun-api/src/main/resources/db/chujiang/base.sql
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/PurchaseOrderLine.java
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractDistributorStandardServiceImpl.java
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/order/PurchaseOrderLineServiceImpl.java
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/order/CreatePurchaseOrderLineVo.java
#	xingyun-sc/src/main/resources/mappers/order/PurchaseOrderLineMapper.xml

@@ -1231,3 +1231,6 @@ ALTER TABLE purchase_order_info
 ALTER TABLE tbl_purchase_order_line
 ALTER TABLE tbl_purchase_order_line
     ADD COLUMN sample_order boolean DEFAULT FALSE COMMENT '是否为试样订单';
     ADD COLUMN sample_order boolean DEFAULT FALSE COMMENT '是否为试样订单';
 
 
+
+
+alter table tbl_purchase_order_line add column contract_distributor_line_id varchar(32) DEFAULT NULL comment '合同物料行ID';

@@ -265,6 +265,11 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private Boolean delFlag;
     private Boolean delFlag;
 
 
     /**
     /**
+     * 合同物料行ID
+     */
+    private String contractDistributorLineId;
+
+    /**
      * 是否为试样订单
      * 是否为试样订单
      */
      */
     private boolean sampleOrder;
     private boolean sampleOrder;

@@ -731,6 +731,7 @@ public class ContractDistributorStandardServiceImpl extends
                 createPurchaseOrderLineVo.setSalesPrice(contractDistributorLine.getUnitPrice());
                 createPurchaseOrderLineVo.setSalesPrice(contractDistributorLine.getUnitPrice());
                 createPurchaseOrderLineVo.setDeliveryDate(contractDistributorLine.getDeliveryDate());
                 createPurchaseOrderLineVo.setDeliveryDate(contractDistributorLine.getDeliveryDate());
                 createPurchaseOrderLineVo.setShowOrder(contractDistributorLine.getShowOrder());
                 createPurchaseOrderLineVo.setShowOrder(contractDistributorLine.getShowOrder());
+                createPurchaseOrderLineVo.setContractDistributorLineId(contractDistributorLine.getId());
                 createPurchaseOrderLineVo.setSampleOrder(contractDistributorLine.getSampleOrder());
                 createPurchaseOrderLineVo.setSampleOrder(contractDistributorLine.getSampleOrder());
                 createPurchaseOrderLineVoList.add(createPurchaseOrderLineVo);
                 createPurchaseOrderLineVoList.add(createPurchaseOrderLineVo);
             });
             });
@@ -757,6 +758,7 @@ public class ContractDistributorStandardServiceImpl extends
                 createPurchaseOrderLineVo.setDeliveryDate(contractStdProcessingLine.getDeliveryDate());
                 createPurchaseOrderLineVo.setDeliveryDate(contractStdProcessingLine.getDeliveryDate());
                 createPurchaseOrderLineVo.setShowOrder(contractStdProcessingLine.getShowOrder());
                 createPurchaseOrderLineVo.setShowOrder(contractStdProcessingLine.getShowOrder());
                 createPurchaseOrderLineVo.setSampleOrder(contractStdProcessingLine.getSampleOrder());
                 createPurchaseOrderLineVo.setSampleOrder(contractStdProcessingLine.getSampleOrder());
+                createPurchaseOrderLineVo.setContractDistributorLineId(contractStdProcessingLine.getId());
                 createPurchaseOrderLineVoList.add(createPurchaseOrderLineVo);
                 createPurchaseOrderLineVoList.add(createPurchaseOrderLineVo);
             });
             });
         }
         }
@@ -1086,9 +1088,14 @@ public class ContractDistributorStandardServiceImpl extends
 
 
         for (int index = 0; index < purchaseOrderLineList.size(); index++) {
         for (int index = 0; index < purchaseOrderLineList.size(); index++) {
             PurchaseOrderLine oldLine = purchaseOrderLineList.get(index);
             PurchaseOrderLine oldLine = purchaseOrderLineList.get(index);
-            UpdateContractDistributorLineVo contractDistributorLine = vo.getContractDistributorLineList().get(index);
+            Map<String, BigDecimal> map = vo.getContractDistributorLineList().stream()
+                    .collect(Collectors.toMap(
+                            UpdateContractDistributorLineVo::getId,
+                            UpdateContractDistributorLineVo::getUnitPrice,
+                            (existing, replacement) -> replacement // 保留后者
+                    ));
             Wrapper<PurchaseOrderLine> updateOrderLineWrapper = Wrappers.lambdaUpdate(PurchaseOrderLine.class)
             Wrapper<PurchaseOrderLine> updateOrderLineWrapper = Wrappers.lambdaUpdate(PurchaseOrderLine.class)
-                    .set(PurchaseOrderLine::getSalesPrice, contractDistributorLine.getUnitPrice())
+                    .set(PurchaseOrderLine::getSalesPrice, map.get(oldLine.getContractDistributorLineId()))
                     .eq(PurchaseOrderLine::getId, oldLine.getId());
                     .eq(PurchaseOrderLine::getId, oldLine.getId());
             purchaseOrderLineService.update(updateOrderLineWrapper);
             purchaseOrderLineService.update(updateOrderLineWrapper);
         }
         }

@@ -128,6 +128,9 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (vo.getPackagingFee() != null) {
         if (vo.getPackagingFee() != null) {
             data.setPackagingFee(vo.getPackagingFee());
             data.setPackagingFee(vo.getPackagingFee());
         }
         }
+        if (!StringUtil.isBlank(vo.getContractDistributorLineId())) {
+            data.setContractDistributorLineId(vo.getContractDistributorLineId());
+        }
         data.setSampleOrder(vo.isSampleOrder());
         data.setSampleOrder(vo.isSampleOrder());
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);

@@ -177,6 +177,12 @@ public class CreatePurchaseOrderLineVo implements BaseVo, Serializable {
     private BigDecimal packagingFee;
     private BigDecimal packagingFee;
 
 
     /**
     /**
+     * 合同物料行ID
+     */
+    @ApiModelProperty("合同物料行ID")
+    private String contractDistributorLineId;
+
+    /**
      * 是否为试样订单
      * 是否为试样订单
      */
      */
     @ApiModelProperty("是否为试样订单")
     @ApiModelProperty("是否为试样订单")

@@ -26,6 +26,7 @@
         <result column="assessment_exceeds_agreement" property="assessmentExceedsAgreement"/>
         <result column="assessment_exceeds_agreement" property="assessmentExceedsAgreement"/>
         <result column="packaging_fee" property="packagingFee"/>
         <result column="packaging_fee" property="packagingFee"/>
         <result column="shipment" property="shipment"/>
         <result column="shipment" property="shipment"/>
+        <result column="contract_distributor_line_id" property="contractDistributorLineId"/>
         <result column="sample_order" property="sampleOrder"/>
         <result column="sample_order" property="sampleOrder"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
@@ -60,6 +61,7 @@
             tb.assessment_exceeds_agreement,
             tb.assessment_exceeds_agreement,
             tb.packaging_fee,
             tb.packaging_fee,
             tb.shipment,
             tb.shipment,
+            tb.contract_distributor_line_id,
             tb.sample_order,
             tb.sample_order,
             tb.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
@@ -98,7 +100,7 @@
         length, length_tol_pos, length_tol_neg,
         length, length_tol_pos, length_tol_neg,
         status, quantity, sales_price, delivery_date, show_order,
         status, quantity, sales_price, delivery_date, show_order,
         assessment_exceeds_agreement, create_by_id, create_by, update_by_id, update_by,
         assessment_exceeds_agreement, create_by_id, create_by, update_by_id, update_by,
-        create_time, update_time, parent_id,packaging_fee,sample_order
+        create_time, update_time, parent_id,packaging_fee,contract_distributor_line_id,sample_order
         ) VALUES
         ) VALUES
         <foreach collection="specList" item="item" separator=",">
         <foreach collection="specList" item="item" separator=",">
             (
             (
@@ -108,7 +110,7 @@
             #{item.length}, #{item.lengthTolPos}, #{item.lengthTolNeg},
             #{item.length}, #{item.lengthTolPos}, #{item.lengthTolNeg},
             #{item.status}, #{item.quantity}, #{item.salesPrice}, #{item.deliveryDate}, #{item.showOrder},
             #{item.status}, #{item.quantity}, #{item.salesPrice}, #{item.deliveryDate}, #{item.showOrder},
             #{item.assessmentExceedsAgreement}, #{item.createById}, #{item.createBy}, #{item.updateById}, #{item.updateBy},
             #{item.assessmentExceedsAgreement}, #{item.createById}, #{item.createBy}, #{item.updateById}, #{item.updateBy},
-            #{item.createTime}, #{item.updateTime}, #{item.parentId},#{item.packagingFee},#{sampleOrder}
+            #{item.createTime}, #{item.updateTime}, #{item.parentId},#{item.packagingFee},#{item.contractDistributorLineId},#{sampleOrder}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>