优化：1：剩余锁规数量移到子表里面；2：允许办事处内勤锁价操作，并且记录锁价人

@@ -761,6 +761,7 @@ create table if not exists `tbl_contract_distributor_standard`
     `standard_approver_id`       varchar(32) COMMENT '标准合同审批人ID',
     `standard_time`               datetime COMMENT '标准合同审批完成时间',
     `price_spec_locked`          TINYINT(1) COMMENT '是否已完成锁价/锁规',
+    `price_lock_user_id`         varchar(32) COMMENT '锁价人员ID',
     `signed_contract_file_id`    VARCHAR(100) COMMENT '双方盖章合同ID',
     `signed_contract_file_name`  VARCHAR(255) COMMENT '双方盖章合同名称',
     `changed`                    TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否变更',
@@ -1470,6 +1471,9 @@ ALTER TABLE tbl_contract_distributor_standard
 ALTER TABLE tbl_contract_distributor_standard
     ADD COLUMN changed tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否变更';
 
+ALTER TABLE tbl_contract_distributor_standard
+    ADD COLUMN price_lock_user_id varchar(32) DEFAULT NULL COMMENT '锁价人员ID';
+
 CREATE TABLE IF NOT EXISTS `tbl_contract_change_application`
 (
     `id`               varchar(32)  NOT NULL COMMENT 'ID',

@@ -81,6 +81,12 @@ public class GetContractDistributorLineBo extends BaseBo<ContractDistributorLine
     private BigDecimal quantity;
 
     /**
+     * 剩余锁规数量
+     */
+    @ApiModelProperty("剩余锁规数量")
+    private BigDecimal remainingQuantity;
+
+    /**
      * 加工费
      */
     @ApiModelProperty(value = "加工费")

@@ -437,6 +437,18 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     @ApiModelProperty(value = "是否已完成锁价/锁规")
     private Boolean priceSpecLocked;
 
+    /**
+     * 锁价人员ID
+     */
+    @ApiModelProperty(value = "锁价人员ID")
+    private String priceLockUserId;
+
+    /**
+     * 锁价人员名称
+     */
+    @ApiModelProperty(value = "锁价人员名称")
+    private String priceLockUserName;
+
     @ApiModelProperty(value = "变更原因")
     private String changeReason;
 

@@ -228,6 +228,18 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     @ApiModelProperty(value = "是否已完成锁价/锁规")
     private Boolean priceSpecLocked;
 
+    /**
+     * 锁价人员ID
+     */
+    @ApiModelProperty(value = "锁价人员ID")
+    private String priceLockUserId;
+
+    /**
+     * 锁价人员名称
+     */
+    @ApiModelProperty(value = "锁价人员名称")
+    private String priceLockUserName;
+
     @ApiModelProperty(value = "变更原因")
     private String changeReason;
 

@@ -225,6 +225,19 @@ public class ContractDistributorStandardController extends DefaultBaseController
             List<SysDept> regionList = sysDeptService.listByIds(regionIds);
             regionMap = regionList.stream().collect(Collectors.toMap(SysDept::getId, SysDept::getName));
         }
+        List<String> priceLockUserIds = boList.stream()
+                .map(QueryContractDistributorStandardBo::getPriceLockUserId)
+                .filter(StringUtils::isNotBlank)
+                .distinct()
+                .collect(Collectors.toList());
+        final Map<String, SysUser> priceLockUserMap;
+        if (CollectionUtils.isNotEmpty(priceLockUserIds)) {
+            priceLockUserMap = CollectionUtils.emptyIfNull(sysUserService.listByIds(priceLockUserIds))
+                    .stream()
+                    .collect(Collectors.toMap(SysUser::getId, Function.identity()));
+        } else {
+            priceLockUserMap = Collections.emptyMap();
+        }
         Map<String, String> finalRegionMap = regionMap;
         boList.forEach(bo -> {
             if (bo == null) {
@@ -267,6 +280,10 @@ public class ContractDistributorStandardController extends DefaultBaseController
                 Customer customer = customerMap.get(bo.getStockUpCompanyId());
                 bo.setStockUpCompanyName(customer == null ? "" : customer.getName());
             }
+            if (StringUtils.isNotBlank(bo.getPriceLockUserId())) {
+                SysUser priceLockUser = priceLockUserMap.get(bo.getPriceLockUserId());
+                bo.setPriceLockUserName(priceLockUser == null ? "" : priceLockUser.getName());
+            }
             //合同状态(标准合同列表展示)
             if (vo != null && "STANDARD".equals(vo.getStatus())) {
                 String contractId = bo.getId();
@@ -374,6 +391,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
                 contractDistributorLineBo.setProductName(productName);
                 lineBoList.add(contractDistributorLineBo);
             });
+            fillUnlockedContractLineRemainingQuantity(result, lineBoList);
 
             result.setContractDistributorLineList(lineBoList);
         }
@@ -413,6 +431,10 @@ public class ContractDistributorStandardController extends DefaultBaseController
             Customer customer1 = customerService.findById(result.getStockUpCompanyId());
             result.setStockUpCompanyName(customer1 == null ? null : customer1.getName());
         }
+        if (StringUtils.isNotBlank(result.getPriceLockUserId())) {
+            SysUser priceLockUser = sysUserService.findById(result.getPriceLockUserId());
+            result.setPriceLockUserName(priceLockUser == null ? null : priceLockUser.getName());
+        }
         //合同状态(标准合同列表展示)
         if ("STANDARD".equals(data.getStatus())) {
             String shippingStatusName = Stream.of(
@@ -447,6 +469,58 @@ public class ContractDistributorStandardController extends DefaultBaseController
     }
 
     /**
+     * 回填未锁规合同子表剩余锁规数量
+     *
+     * @param contract 合同
+     * @param lineBoList 合同子表
+     */
+    private void fillUnlockedContractLineRemainingQuantity(GetContractDistributorStandardBo contract,
+                                                          List<GetContractDistributorLineBo> lineBoList) {
+        if (contract == null || CollectionUtils.isEmpty(lineBoList)) {
+            return;
+        }
+        if (!"DRAFT_DIST_AGMT".equals(contract.getType()) && !"INTL_OPEN_SPEC_AGMT".equals(contract.getType())) {
+            return;
+        }
+        if (StringUtils.isBlank(contract.getId())) {
+            return;
+        }
+
+        Wrapper<ContractDistributorStandard> childWrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
+                .select(ContractDistributorStandard::getId)
+                .eq(ContractDistributorStandard::getParentId, contract.getId());
+        List<String> childContractIds = CollectionUtils.emptyIfNull(contractDistributorStandardService.list(childWrapper))
+                .stream()
+                .map(ContractDistributorStandard::getId)
+                .filter(StringUtils::isNotBlank)
+                .collect(Collectors.toList());
+
+        Map<String, BigDecimal> lockedQuantityMap = Collections.emptyMap();
+        if (CollectionUtils.isNotEmpty(childContractIds)) {
+            Wrapper<ContractDistributorLine> childLineWrapper = Wrappers.lambdaQuery(ContractDistributorLine.class)
+                    .select(ContractDistributorLine::getItemId, ContractDistributorLine::getQuantity)
+                    .in(ContractDistributorLine::getContractId, childContractIds);
+            lockedQuantityMap = CollectionUtils.emptyIfNull(contractDistributorLineService.list(childLineWrapper))
+                    .stream()
+                    .filter(Objects::nonNull)
+                    .filter(item -> StringUtils.isNotBlank(item.getItemId()))
+                    .filter(item -> item.getQuantity() != null)
+                    .collect(Collectors.groupingBy(ContractDistributorLine::getItemId,
+                            Collectors.reducing(BigDecimal.ZERO, ContractDistributorLine::getQuantity, BigDecimal::add)));
+        }
+
+        Map<String, BigDecimal> finalLockedQuantityMap = lockedQuantityMap;
+        lineBoList.forEach(line -> {
+            BigDecimal quantity = line.getQuantity() == null ? BigDecimal.ZERO : line.getQuantity();
+            BigDecimal lockedQuantity = StringUtils.isBlank(line.getItemId())
+                    ? BigDecimal.ZERO
+                    : finalLockedQuantityMap.getOrDefault(line.getItemId(), BigDecimal.ZERO);
+            BigDecimal remainingQuantity = quantity.subtract(lockedQuantity);
+            line.setRemainingQuantity(remainingQuantity);
+        });
+    }
+
+    /**
      * 新增
      */
     @ApiOperation("新增")

@@ -314,6 +314,11 @@ public class ContractDistributorStandard extends BaseEntity implements BaseDto {
     private Boolean priceSpecLocked;
 
     /**
+     * 锁价人员ID
+     */
+    private String priceLockUserId;
+
+    /**
      * 变更原因
      */
     private String changeReason;

@@ -1476,6 +1476,7 @@ public class ContractDistributorStandardServiceImpl extends
         data.setOrderDate(LocalDate.now());
         data.setStatus("STANDARD");
         data.setParentId(vo.getId());
+        data.setPriceLockUserId(SecurityUtil.getCurrentUser().getId());
         data.setChangeReason(vo.getChangeReason());
 //        data.setStandardizedAt(LocalDateTime.now());
         getBaseMapper().insert(data);