楚江ERP:合同锁规不限制次数只限制总数量

@@ -1051,13 +1051,19 @@ public class ContractDistributorStandardServiceImpl extends
                 .eq(ContractDistributorStandard::getParentId, vo.getId());
 
         List<ContractDistributorStandard> childContractList = getBaseMapper().selectList(childWrapper);
-        BigDecimal allChildTotalQuantity = vo.getTotalQuantity().add(CollectionUtils.isEmpty(childContractList) ? new BigDecimal(0) : childContractList.get(0).getTotalQuantity());
+        //已锁规数量
+        BigDecimal totalLockedQuantity = childContractList.stream()
+                .map(ContractDistributorStandard::getTotalQuantity)
+                .filter(Objects::nonNull)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+        BigDecimal allChildTotalQuantity = vo.getTotalQuantity().add(totalLockedQuantity);
         if (allChildTotalQuantity.compareTo(data.getTotalQuantity()) > 0) {
             throw new DefaultClientException("锁规总数量大于合同总数量，锁规失败！");
         }
 
-        // 判断锁规是否完成（锁规两次或锁规数量等于合同数量）
-        boolean checkPriceSpecLocked = CollectionUtils.isNotEmpty(childContractList) || (allChildTotalQuantity.compareTo(data.getTotalQuantity()) == 0);
+        // 判断锁规是否完成（锁规数量等于合同数量）
+        boolean checkPriceSpecLocked = allChildTotalQuantity.compareTo(data.getTotalQuantity()) == 0;
 
         data.setId(IdUtil.getUUID());
         data.setTotalQuantity(vo.getTotalQuantity());