diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index d5c46c235..20da7d3ec 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java @@ -339,7 +339,9 @@ public class StockShelfOrderApplicationService { List shelfMaterialDetailDOChildrenList1 = shelfMaterialDetailDO.getChildren(); if (shelfMaterialDetailDOChildrenList1 != null && !shelfMaterialDetailDOChildrenList1.isEmpty() && shelfMaterialDetailDOChildrenList1.size() > 0) { ShelfMaterialDetailDO shelfMaterialDetailDOChildren = null; - List shelfMaterialDetailDOChildrenList11 = shelfMaterialDetailDO.getChildren().stream().filter(p -> 1 == p.getLevel()).collect(Collectors.toList()); + List shelfMaterialDetailDOChildrenList11 = shelfMaterialDetailDO.getChildren().stream() + .filter(p -> p.getLevel() != null && 1 == p.getLevel()) + .collect(Collectors.toList()); if (shelfMaterialDetailDOChildrenList11 != null && !shelfMaterialDetailDOChildrenList11.isEmpty() && shelfMaterialDetailDOChildrenList11.size() > 0) shelfMaterialDetailDOChildren = shelfMaterialDetailDOChildrenList11.get(0); if (shelfMaterialDetailDOChildren != null) { shelfMaterialDetailDO.setMaterialDetailId(shelfMaterialDetailDOChildren.getMaterialDetailId());