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

pda上架报错;

Browse Source
This commit is contained in:
王奎兴
2026-03-06 09:39:22 +08:00
parent 4371be3999
commit 2f31cc736a
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
+22 -10
View File
@@ -337,15 +337,19 @@ public class StockShelfOrderApplicationService {
List<ShelfMaterialDetailDO> shelfMaterialDetailDOList = stockReceiptOrderDO.getMaterialDetailList(); List<ShelfMaterialDetailDO> shelfMaterialDetailDOList = stockReceiptOrderDO.getMaterialDetailList();
shelfMaterialDetailDOList.forEach(shelfMaterialDetailDO -> { shelfMaterialDetailDOList.forEach(shelfMaterialDetailDO -> {
List<ShelfMaterialDetailDO> shelfMaterialDetailDOChildrenList1 = shelfMaterialDetailDO.getChildren(); List<ShelfMaterialDetailDO> shelfMaterialDetailDOChildrenList1 = shelfMaterialDetailDO.getChildren();
ShelfMaterialDetailDO shelfMaterialDetailDOChildren = shelfMaterialDetailDOChildrenList1.stream().filter(p -> 1 == p.getLevel()).collect(Collectors.toList()).get(0); ShelfMaterialDetailDO shelfMaterialDetailDOChildren = null;
shelfMaterialDetailDO.setMaterialDetailId(shelfMaterialDetailDOChildren.getMaterialDetailId()); List<ShelfMaterialDetailDO> shelfMaterialDetailDOChildrenList11 = shelfMaterialDetailDO.getChildren().stream().filter(p -> 1 == p.getLevel()).collect(Collectors.toList());
shelfMaterialDetailDO.setShelvesQuantity(shelfMaterialDetailDOChildren.getShelvesQuantity()); if (shelfMaterialDetailDOChildrenList11 != null && !shelfMaterialDetailDOChildrenList11.isEmpty() && shelfMaterialDetailDOChildrenList11.size() != 0) shelfMaterialDetailDOChildren = shelfMaterialDetailDOChildrenList11.get(0);
shelfMaterialDetailDO.setWarehouseId(shelfMaterialDetailDOChildren.getWarehouseId()); if (shelfMaterialDetailDOChildren != null) {
shelfMaterialDetailDO.setStorageSectionId(shelfMaterialDetailDOChildren.getStorageSectionId()); shelfMaterialDetailDO.setMaterialDetailId(shelfMaterialDetailDOChildren.getMaterialDetailId());
shelfMaterialDetailDO.setStorageLocationId(shelfMaterialDetailDOChildren.getStorageLocationId()); shelfMaterialDetailDO.setShelvesQuantity(shelfMaterialDetailDOChildren.getShelvesQuantity());
shelfMaterialDetailDO.setContainerId(shelfMaterialDetailDOChildren.getContainerId()); shelfMaterialDetailDO.setWarehouseId(shelfMaterialDetailDOChildren.getWarehouseId());
shelfMaterialDetailDO.setLevel(shelfMaterialDetailDOChildren.getLevel()); shelfMaterialDetailDO.setStorageSectionId(shelfMaterialDetailDOChildren.getStorageSectionId());
shelfMaterialDetailDO.setMaterialDetailSerialNumberList(shelfMaterialDetailDOChildren.getMaterialDetailSerialNumberList()); shelfMaterialDetailDO.setStorageLocationId(shelfMaterialDetailDOChildren.getStorageLocationId());
shelfMaterialDetailDO.setContainerId(shelfMaterialDetailDOChildren.getContainerId());
shelfMaterialDetailDO.setLevel(shelfMaterialDetailDOChildren.getLevel());
shelfMaterialDetailDO.setMaterialDetailSerialNumberList(shelfMaterialDetailDOChildren.getMaterialDetailSerialNumberList());
}
//只留二级 //只留二级
List<ShelfMaterialDetailDO> shelfMaterialDetailDOChildrenList2 = shelfMaterialDetailDOChildrenList1.stream().filter(p -> 2 == p.getLevel()).collect(Collectors.toList()); List<ShelfMaterialDetailDO> shelfMaterialDetailDOChildrenList2 = shelfMaterialDetailDOChildrenList1.stream().filter(p -> 2 == p.getLevel()).collect(Collectors.toList());
shelfMaterialDetailDO.setChildren(shelfMaterialDetailDOChildrenList2); shelfMaterialDetailDO.setChildren(shelfMaterialDetailDOChildrenList2);
@@ -469,7 +473,15 @@ public class StockShelfOrderApplicationService {
if (shelfMaterialDetailPO == null){ if (shelfMaterialDetailPO == null){
throw new ServiceException("物料明细不存在"); throw new ServiceException("物料明细不存在");
} }
if (shelfMaterialDetailDO.getShelvesQuantity().compareTo(BigDecimal.ZERO) == 0){ List<ShelfMaterialDetailDO> children = shelfMaterialDetailDO.getChildren();
BigDecimal childrenShelvesQuantitySum = BigDecimal.ZERO;
if (!CollectionUtils.isEmpty(children)) {
childrenShelvesQuantitySum = children.stream()
.map(ShelfMaterialDetailDO::getShelvesQuantity)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
}
if (shelfMaterialDetailDO.getShelvesQuantity().compareTo(BigDecimal.ZERO) == 0 && childrenShelvesQuantitySum.compareTo(BigDecimal.ZERO) == 0){
//未进行上架直接跳过 //未进行上架直接跳过
continue; continue;
} }