From 9892ce1d64700ef63858da48bf035b3b66ecf303 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Mon, 11 May 2026 17:33:08 +0800
Subject: [PATCH] =?UTF-8?q?1463=20WMS=E7=B3=BB=E7=BB=9F=E9=92=A2=E6=9E=84?=
 =?UTF-8?q?=E5=8C=85=E9=87=87=E8=B4=AD=E4=B8=9A=E5=8A=A1=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StructuralPackageOrderController.java        | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

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 9508cefc..c6fd58ef 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<WmsStructuralPackageOrderTrayItem> 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);