交接单采购/转生产 操过待处理数量 将待处理数量赋值0

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -209,9 +209,10 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
                     throw new ServiceException("该合同产品不存在,请检查");
                 }
                 BigDecimal expendQuantity = contractProduct.getExpendQuantity().subtract(w.getQuantity());
-//                if (expendQuantity.compareTo(BigDecimal.ZERO) < 1) {//小于0不让继续执行
-//                    throw new ServiceException("生产数量不得大于销售合同数量");
-//                }
+                if (expendQuantity.compareTo(BigDecimal.ZERO) < 0) {
+                    //外销合同-交接单转生产 如果转生产数量大于大于合同数量 将待处理数量改为0
+                    expendQuantity = BigDecimal.ZERO;
+                }
                 contractProduct.setExpendQuantity(expendQuantity);
                 upContractProduct.add(contractProduct);
             }

hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseFlow.java

@@ -126,9 +126,10 @@ public class PurchaseFlow extends FlowDelegate {
                     p.getDataResource() == PurchaseDataResourceEnum.DATA_RESOURCE_1.getKey()) {//如果采购的是外销合同
                 ContractProduct contractProduct = contractProductService.getById(p.getDataResourceId());
                 BigDecimal expendQuantity = contractProduct.getExpendQuantity().subtract(p.getCount());
-//                if (expendQuantity.compareTo(BigDecimal.ZERO) < 1) {//小于0不让继续执行
-//                    throw new ServiceException("采购数量不得大于合同剩余采购数量");
-//                }
+                if (expendQuantity.compareTo(BigDecimal.ZERO) < 0) {
+                    //外销合同-交接单采购 如果采购数量大于大于合同数量 将待处理数量改为0
+                    expendQuantity = BigDecimal.ZERO;
+                }
                 contractProduct.setExpendQuantity(expendQuantity);
                 upContractProduct.add(contractProduct);
             }