weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
zhou-hongcheng
2026-02-28 17:12:50 +08:00
parent c6484779ea fc7cfca8e6
commit 5377016c18
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+3 -13
View File
@@ -851,8 +851,9 @@ public class StockOutOrderApplicationService {
continue; continue;
} }
OutMaterialDetailDO returnOutMaterialDetailDOChild = new OutMaterialDetailDO(); OutMaterialDetailDO returnOutMaterialDetailDOChild = new OutMaterialDetailDO();
BeanUtils.copyProperties(outMaterialDetailPO, returnOutMaterialDetailDOChild, "materialDetailId","createBy","createByName","createTime", BeanUtils.copyProperties(outMaterialDetailPO, returnOutMaterialDetailDOChild,
"updateBy","updateByName","updateTime"); "materialDetailId","createBy","createByName","createTime",
"updateBy","updateByName","updateTime","alreadyAllocationQuantity");
BeanUtils.copyProperties(outMaterialDetailDOChild, returnOutMaterialDetailDOChild, IgnoreNullUtil.getNullPropertyNames(outMaterialDetailDOChild)); BeanUtils.copyProperties(outMaterialDetailDOChild, returnOutMaterialDetailDOChild, IgnoreNullUtil.getNullPropertyNames(outMaterialDetailDOChild));
if (ObjectUtil.isNotNull(returnOutMaterialDetailDOChild.getMaterialDetailId()) && returnOutMaterialDetailDOChild.getMaterialDetailId() == 0){ if (ObjectUtil.isNotNull(returnOutMaterialDetailDOChild.getMaterialDetailId()) && returnOutMaterialDetailDOChild.getMaterialDetailId() == 0){
returnOutMaterialDetailDOChild.setMaterialDetailId(null); returnOutMaterialDetailDOChild.setMaterialDetailId(null);
@@ -866,17 +867,6 @@ public class StockOutOrderApplicationService {
returnOutMaterialDetailDOChild.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); returnOutMaterialDetailDOChild.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId));
returnOutMaterialDetailDOChild.setLevel(2); returnOutMaterialDetailDOChild.setLevel(2);
returnOutMaterialDetailDOChild.setParentUniqueId(outMaterialDetailPO.getUniqueId()); 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); returnOutMaterialDetailDOChildList.add(returnOutMaterialDetailDOChild);
totalAllocationQuantity = totalAllocationQuantity.add(returnOutMaterialDetailDOChild.getAllocationQuantity()); totalAllocationQuantity = totalAllocationQuantity.add(returnOutMaterialDetailDOChild.getAllocationQuantity());
} }
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
+2 -1
View File
@@ -282,7 +282,7 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
for (OutMaterialDetailDO outMaterialDetailDOChild : materialDetailDOChildList){ for (OutMaterialDetailDO outMaterialDetailDOChild : materialDetailDOChildList){
OutMaterialDetail outMaterialDetailChild = new OutMaterialDetail(); OutMaterialDetail outMaterialDetailChild = new OutMaterialDetail();
BeanUtils.copyProperties(outMaterialDetailDOChild, outMaterialDetailChild, IgnoreNullUtil.getNullPropertyNames(outMaterialDetailDOChild)); BeanUtils.copyProperties(outMaterialDetailDOChild, outMaterialDetailChild, IgnoreNullUtil.getNullPropertyNames(outMaterialDetailDOChild));
outMaterialDetailChild.setMaterialDetailId(null); //outMaterialDetailChild.setMaterialDetailId(null);
outMaterialDetailChild.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId)); outMaterialDetailChild.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId));
outMaterialDetailChild.setLevel(2); outMaterialDetailChild.setLevel(2);
outMaterialDetailChild.setParentUniqueId(outMaterialDetailDO.getUniqueId()); outMaterialDetailChild.setParentUniqueId(outMaterialDetailDO.getUniqueId());
@@ -293,6 +293,7 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
BigDecimal alreadyAllocationQuantity = outMaterialDetailChild.getAlreadyAllocationQuantity() != null ? outMaterialDetailChild.getAlreadyAllocationQuantity() : BigDecimal.ZERO; BigDecimal alreadyAllocationQuantity = outMaterialDetailChild.getAlreadyAllocationQuantity() != null ? outMaterialDetailChild.getAlreadyAllocationQuantity() : BigDecimal.ZERO;
BigDecimal nowAllocationQuantity = allocationQuantity.subtract(alreadyAllocationQuantity); BigDecimal nowAllocationQuantity = allocationQuantity.subtract(alreadyAllocationQuantity);
outMaterialDetailChild.setNowAllocationQuantity(nowAllocationQuantity); outMaterialDetailChild.setNowAllocationQuantity(nowAllocationQuantity);
outMaterialDetailChild.setAlreadyAllocationQuantity(allocationQuantity);
outMaterialDetailListChild.add(outMaterialDetailChild); outMaterialDetailListChild.add(outMaterialDetailChild);
} }
} }