diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index ccd3fb81..53439988 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -453,8 +453,20 @@ public class StructuralPackageOrderController extends BaseController { List items = structuralPackageOrderTrayItemService.getList(id); vo.setItems(items.stream().map(item -> { TrayItemVO ivo = Convert.convert(TrayItemVO.class, item); - // 由于断开了与托盘的关联,托盘号设置为空 - ivo.setNo(""); + // 获取托盘号:如果物料项有关联的托盘,则使用托盘号;否则为空 + if (item.getTrayId() != null) { + WmsStructuralPackageOrderTray tray = trays.stream() + .filter(t -> t.getId().equals(item.getTrayId())) + .findFirst() + .orElse(null); + if (tray != null) { + ivo.setNo(tray.getNo()); + } else { + ivo.setNo(""); + } + } else { + ivo.setNo(""); + } // 获取订单下的任意一个托盘状态(如果有托盘的话) if (CollectionUtil.isNotEmpty(trays)) { WmsStructuralPackageOrderTray firstTray = trays.get(0);