diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 364bc4dea..ac18dd802 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -844,6 +844,7 @@ public class StockOutOrderApplicationService { List returnOutMaterialDetailDOChildList = new ArrayList<>(); List outMaterialDetailDOChildList = outMaterialDetailDO.getChildren(); if (!CollectionUtils.isEmpty(outMaterialDetailDOChildList)){ + BigDecimal totalNowAllocationQuantity = BigDecimal.ZERO;//当前作业分配数量 for (OutMaterialDetailDO outMaterialDetailDOChild : outMaterialDetailDOChildList){ OutMaterialDetailPO outMaterialDetailPOChildDb = outMaterialDetailDbMap.get(outMaterialDetailDOChild.getMaterialDetailId()); if (outMaterialDetailPOChildDb != null){ @@ -867,6 +868,16 @@ public class StockOutOrderApplicationService { returnOutMaterialDetailDOChild.setParentUniqueId(outMaterialDetailPO.getUniqueId()); returnOutMaterialDetailDOChildList.add(returnOutMaterialDetailDOChild); totalAllocationQuantity = totalAllocationQuantity.add(returnOutMaterialDetailDOChild.getAllocationQuantity()); + BigDecimal allocationQuantity1 = returnOutMaterialDetailDOChild.getAllocationQuantity(); + BigDecimal alreadyAllocationQuantity1 = returnOutMaterialDetailDOChild.getAlreadyAllocationQuantity(); + if (allocationQuantity1 == null) { + allocationQuantity1 = BigDecimal.ZERO; + } + if (alreadyAllocationQuantity1 == null) { + alreadyAllocationQuantity1 = BigDecimal.ZERO; + } + BigDecimal nowAllocationQuantity1 = allocationQuantity1.subtract(alreadyAllocationQuantity1); + totalNowAllocationQuantity = totalNowAllocationQuantity.add(nowAllocationQuantity1); } } //主单当分配作业数量和