1：库存合同锁价新增变更原因；2：锁规增加剩余锁规数量

@@ -1462,3 +1462,6 @@ ALTER TABLE tbl_contract_distributor_standard
     ADD COLUMN foreign_destination varchar(200) COMMENT '目的地(外贸)';
     ADD COLUMN foreign_destination varchar(200) COMMENT '目的地(外贸)';
 
 
 ALTER TABLE tbl_purchase_order_line ADD COLUMN production_process text COMMENT '生产工艺';
 ALTER TABLE tbl_purchase_order_line ADD COLUMN production_process text COMMENT '生产工艺';
+
+ALTER TABLE tbl_contract_distributor_standard
+    ADD COLUMN change_reason varchar(50) DEFAULT NULL COMMENT '变更原因';

@@ -437,6 +437,12 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     @ApiModelProperty(value = "是否已完成锁价/锁规")
     @ApiModelProperty(value = "是否已完成锁价/锁规")
     private Boolean priceSpecLocked;
     private Boolean priceSpecLocked;
 
 
+    @ApiModelProperty(value = "变更原因")
+    private String changeReason;
+
+    @ApiModelProperty(value = "剩余数量")
+    private BigDecimal remainingQuantity;
+
     /**
     /**
      * 合同名称（销售合同、销售订单）
      * 合同名称（销售合同、销售订单）
      */
      */

@@ -216,6 +216,12 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     @ApiModelProperty(value = "是否已完成锁价/锁规")
     @ApiModelProperty(value = "是否已完成锁价/锁规")
     private Boolean priceSpecLocked;
     private Boolean priceSpecLocked;
 
 
+    @ApiModelProperty(value = "变更原因")
+    private String changeReason;
+
+    @ApiModelProperty(value = "剩余数量")
+    private BigDecimal remainingQuantity;
+
     /**
     /**
      * 双方盖章合同ID
      * 双方盖章合同ID
      */
      */

@@ -314,6 +314,11 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private Boolean priceSpecLocked;
     private Boolean priceSpecLocked;
 
 
     /**
     /**
+     * 变更原因
+     */
+    private String changeReason;
+
+    /**
      * 双方盖章合同ID
      * 双方盖章合同ID
      */
      */
     private String signedContractFileId;
     private String signedContractFileId;
@@ -362,4 +367,10 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)
     private Boolean canSplit;
     private Boolean canSplit;
+
+    /**
+     * 剩余锁规数量
+     */
+    @TableField(exist = false)
+    private BigDecimal remainingQuantity;
 }
 }

@@ -236,6 +236,7 @@ public class ContractDistributorStandardServiceImpl extends
             canEdit = true;
             canEdit = true;
         }
         }
         data.setCanEdit(canEdit);
         data.setCanEdit(canEdit);
+        fillRemainingQuantity(data);
 
 
         // 获取当前人员的待办任务数据
         // 获取当前人员的待办任务数据
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
@@ -260,6 +261,31 @@ public class ContractDistributorStandardServiceImpl extends
         return data;
         return data;
     }
     }
 
 
+    private void fillRemainingQuantity(ContractDistributorStandard data) {
+        if (data == null || StringUtils.isBlank(data.getId())) {
+            return;
+        }
+        if (data.getTotalQuantity() == null) {
+            data.setRemainingQuantity(BigDecimal.ZERO);
+            return;
+        }
+
+        Wrapper<ContractDistributorStandard> childWrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
+                .eq(ContractDistributorStandard::getParentId, data.getId());
+        List<ContractDistributorStandard> childContractList = getBaseMapper().selectList(childWrapper);
+        BigDecimal totalLockedQuantity = CollectionUtils.emptyIfNull(childContractList).stream()
+                .filter(Objects::nonNull)
+                .map(ContractDistributorStandard::getTotalQuantity)
+                .filter(Objects::nonNull)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+        BigDecimal remainingQuantity = data.getTotalQuantity().subtract(totalLockedQuantity);
+        if (remainingQuantity.compareTo(BigDecimal.ZERO) < 0) {
+            remainingQuantity = BigDecimal.ZERO;
+        }
+        data.setRemainingQuantity(remainingQuantity);
+    }
+
     private boolean isCanSplitByCode(String code) {
     private boolean isCanSplitByCode(String code) {
         if (StringUtils.isBlank(code)) {
         if (StringUtils.isBlank(code)) {
             return false;
             return false;
@@ -1264,6 +1290,7 @@ public class ContractDistributorStandardServiceImpl extends
         data.setOrderDate(LocalDate.now());
         data.setOrderDate(LocalDate.now());
         data.setStatus("STANDARD");
         data.setStatus("STANDARD");
         data.setParentId(vo.getId());
         data.setParentId(vo.getId());
+        data.setChangeReason(vo.getChangeReason());
 //        data.setStandardizedAt(LocalDateTime.now());
 //        data.setStandardizedAt(LocalDateTime.now());
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
 
 
@@ -1292,6 +1319,7 @@ public class ContractDistributorStandardServiceImpl extends
 
 
         Wrapper<ContractDistributorStandard> changeLocked = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
         Wrapper<ContractDistributorStandard> changeLocked = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
                 .set(ContractDistributorStandard::getPriceSpecLocked, true)
                 .set(ContractDistributorStandard::getPriceSpecLocked, true)
+                .set(StringUtils.isNotBlank(vo.getChangeReason()), ContractDistributorStandard::getChangeReason, vo.getChangeReason())
                 .eq(ContractDistributorStandard::getId, vo.getId());
                 .eq(ContractDistributorStandard::getId, vo.getId());
         getBaseMapper().update(changeLocked);
         getBaseMapper().update(changeLocked);
 
 

@@ -233,6 +233,10 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     @Length(message = "备注最多允许65,535个字符！")
     @Length(message = "备注最多允许65,535个字符！")
     private String remarks;
     private String remarks;
 
 
+    @ApiModelProperty(value = "变更原因")
+    @Length(message = "变更原因最多允许50个字符！")
+    private String changeReason;
+
     /**
     /**
      * 合计数量
      * 合计数量
      */
      */

@@ -64,6 +64,7 @@
         <result column="formalized_at" property="formalizedAt"/>
         <result column="formalized_at" property="formalizedAt"/>
         <result column="standardized_at" property="standardizedAt"/>
         <result column="standardized_at" property="standardizedAt"/>
         <result column="title" property="title"/>
         <result column="title" property="title"/>
+        <result column="change_reason" property="changeReason"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="ContractDistributorStandard_sql">
     <sql id="ContractDistributorStandard_sql">
@@ -127,7 +128,8 @@
                tb.signed_contract_file_name,
                tb.signed_contract_file_name,
                tb.formalized_at,
                tb.formalized_at,
                tb.standardized_at,
                tb.standardized_at,
-               tb.title
+               tb.title,
+               tb.change_reason
         FROM tbl_contract_distributor_standard AS tb
         FROM tbl_contract_distributor_standard AS tb
     </sql>
     </sql>