合同：库存合同锁价问题处理

@@ -961,3 +961,5 @@ create table if not exists customer_visit_record(
     create_time datetime default now() comment '创建时间',
     create_time datetime default now() comment '创建时间',
     update_time datetime default now() comment '更新时间'
     update_time datetime default now() 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;
+
+    /**
      * 新增/删除/变更
      * 新增/删除/变更
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -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());
                 createPurchaseOrderLineVoList.add(createPurchaseOrderLineVo);
                 createPurchaseOrderLineVoList.add(createPurchaseOrderLineVo);
             });
             });
         }
         }
@@ -755,6 +756,7 @@ public class ContractDistributorStandardServiceImpl extends
                 createPurchaseOrderLineVo.setSalesPrice(contractStdProcessingLine.getUnitPrice());
                 createPurchaseOrderLineVo.setSalesPrice(contractStdProcessingLine.getUnitPrice());
                 createPurchaseOrderLineVo.setDeliveryDate(contractStdProcessingLine.getDeliveryDate());
                 createPurchaseOrderLineVo.setDeliveryDate(contractStdProcessingLine.getDeliveryDate());
                 createPurchaseOrderLineVo.setShowOrder(contractStdProcessingLine.getShowOrder());
                 createPurchaseOrderLineVo.setShowOrder(contractStdProcessingLine.getShowOrder());
+                createPurchaseOrderLineVo.setContractDistributorLineId(contractStdProcessingLine.getId());
                 createPurchaseOrderLineVoList.add(createPurchaseOrderLineVo);
                 createPurchaseOrderLineVoList.add(createPurchaseOrderLineVo);
             });
             });
         }
         }
@@ -1084,9 +1086,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());
+        }
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 

@@ -176,4 +176,10 @@ public class CreatePurchaseOrderLineVo implements BaseVo, Serializable {
     @IsNumberPrecision(message = "包装费最多允许4位小数！", value = 4)
     @IsNumberPrecision(message = "包装费最多允许4位小数！", value = 4)
     private BigDecimal packagingFee;
     private BigDecimal packagingFee;
 
 
+    /**
+     * 合同物料行ID
+     */
+    @ApiModelProperty("合同物料行ID")
+    private String contractDistributorLineId;
+
 }
 }

@@ -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="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -59,6 +60,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.create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.create_by,
             tb.update_by_id,
             tb.update_by_id,
@@ -96,7 +98,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
+        create_time, update_time, parent_id,packaging_fee,contract_distributor_line_id
         ) VALUES
         ) VALUES
         <foreach collection="specList" item="item" separator=",">
         <foreach collection="specList" item="item" separator=",">
             (
             (
@@ -106,7 +108,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}
+            #{item.createTime}, #{item.updateTime}, #{item.parentId},#{item.packagingFee},#{item.contractDistributorLineId}
             )
             )
         </foreach>
         </foreach>
     </insert>
     </insert>