diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 41928f335..ac01403be 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -820,11 +820,11 @@ public class StockOutOrderDomainService { waitQty = BigDecimal.ZERO; } outMaterialDetailPO.setWaitCheckQuantity(waitQty); - // quantity=PC下发时的拣货数量,actualQuantity默认=待复核数量 + // quantity=PC下发时的拣货数量,actualQuantity:已复核则取checkQuantity,否则取待复核数量 if (pickQty != null) { outMaterialDetailPO.setQuantity(pickQty); } - outMaterialDetailPO.setActualQuantity(waitQty); + outMaterialDetailPO.setActualQuantity(checkQty.compareTo(BigDecimal.ZERO) > 0 ? checkQty : waitQty); } List children = outMaterialDetailPO.getChildren(); if (!CollectionUtils.isEmpty(children)) { @@ -852,11 +852,11 @@ public class StockOutOrderDomainService { waitQtyChild = BigDecimal.ZERO; } outMaterialDetailPOChild.setWaitCheckQuantity(waitQtyChild); - // quantity=PC下发时的拣货数量,actualQuantity默认=待复核数量 + // quantity=PC下发时的拣货数量,actualQuantity:已复核则取checkQuantity,否则取待复核数量 if (pickQtyChild != null) { outMaterialDetailPOChild.setQuantity(pickQtyChild); } - outMaterialDetailPOChild.setActualQuantity(waitQtyChild); + outMaterialDetailPOChild.setActualQuantity(checkQtyChild.compareTo(BigDecimal.ZERO) > 0 ? checkQtyChild : waitQtyChild); } } }