diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java index 9a68fb0ad..b51e059e5 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/persistence/ShelfMaterialDetailImpl.java @@ -87,9 +87,18 @@ public class ShelfMaterialDetailImpl extends ServiceImpl shelfParentIds = shelfMaterialDetailPOList.stream() + .filter(po -> po.getUniqueId() != null) + .map(ShelfMaterialDetailPO::getUniqueId) + .collect(Collectors.toSet()); List receiptMaterialDetailPOParentList = shelfMaterialDetailPOList - .stream().filter(e -> 1 == e.getLevel()).collect(Collectors.toList()); + .stream().filter(e -> e.getLevel() != null && ( + 1 == e.getLevel() + || (2 == e.getLevel() && (e.getParentUniqueId() == null || Long.valueOf(0).equals(e.getParentUniqueId()))) + || (2 == e.getLevel() && e.getParentUniqueId() != null && !shelfParentIds.contains(e.getParentUniqueId())) + )).collect(Collectors.toList()); // 递归查询子集 for(ShelfMaterialDetailPO materialDetailPO : receiptMaterialDetailPOParentList){ List children = getChildren(materialDetailPO.getUniqueId(), shelfMaterialDetailPOList, 2); diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockShelfOrder/StockShelfOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockShelfOrder/StockShelfOrderApi.java index 457490cca..89b529895 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockShelfOrder/StockShelfOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockShelfOrder/StockShelfOrderApi.java @@ -55,13 +55,13 @@ public class StockShelfOrderApi extends BaseController { } /** - * 获取上架单详细信息 + * 获取上架单详细信息(与 PDA 一致添加 parent_copy,确保 PC 详情页从 children 读取时能展示物料明细) */ @ApiOperation("获取上架单") @GetMapping(value = "/getInfo/{shelfOrderId}") public AjaxResult getInfo(@PathVariable("shelfOrderId") Long shelfOrderId) { - return AjaxResult.success(stockShelfOrderApplicationService.getInfo(shelfOrderId)); + return AjaxResult.success(stockShelfOrderApplicationService.getInfo(shelfOrderId, true)); } @ApiOperation("任务下发")