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 200e3ab3d..8ef56fa3a 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 @@ -851,8 +851,9 @@ public class StockOutOrderApplicationService { continue; } OutMaterialDetailDO returnOutMaterialDetailDOChild = new OutMaterialDetailDO(); - BeanUtils.copyProperties(outMaterialDetailPO, returnOutMaterialDetailDOChild, "materialDetailId","createBy","createByName","createTime", - "updateBy","updateByName","updateTime"); + BeanUtils.copyProperties(outMaterialDetailPO, returnOutMaterialDetailDOChild, + "materialDetailId","createBy","createByName","createTime", + "updateBy","updateByName","updateTime","alreadyAllocationQuantity"); BeanUtils.copyProperties(outMaterialDetailDOChild, returnOutMaterialDetailDOChild, IgnoreNullUtil.getNullPropertyNames(outMaterialDetailDOChild)); if (ObjectUtil.isNotNull(returnOutMaterialDetailDOChild.getMaterialDetailId()) && returnOutMaterialDetailDOChild.getMaterialDetailId() == 0){ returnOutMaterialDetailDOChild.setMaterialDetailId(null); @@ -866,17 +867,6 @@ public class StockOutOrderApplicationService { returnOutMaterialDetailDOChild.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); returnOutMaterialDetailDOChild.setLevel(2); returnOutMaterialDetailDOChild.setParentUniqueId(outMaterialDetailPO.getUniqueId()); - 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); - returnOutMaterialDetailDOChild.setAlreadyAllocationQuantity(allocationQuantity1); - returnOutMaterialDetailDOChild.setNowAllocationQuantity(nowAllocationQuantity1); returnOutMaterialDetailDOChildList.add(returnOutMaterialDetailDOChild); totalAllocationQuantity = totalAllocationQuantity.add(returnOutMaterialDetailDOChild.getAllocationQuantity()); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index 0864d47a8..7979f059b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -282,7 +282,7 @@ public class OutMaterialDetailImpl extends ServiceImpl