From 593c9a5312e7cdb0e2f67fe4c338a624dccd9d3c Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Mon, 11 May 2026 16:59:16 +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

---
 .../mapper/WmsStructuralPackageOrderTrayItemMapper.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
index 394c4624..3e750468 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
@@ -23,11 +23,11 @@
     </select>
 
     <select id="getListByOrderId" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemVO">
-        SELECT ROW_NUMBER() OVER (ORDER BY oti.id) AS "index",m.image,m.drawing_no,oti.*,
-            '' as "tray_no",0 as "state",
+        SELECT ROW_NUMBER() OVER (ORDER BY oti.id) AS "index",m.image,m.drawing_no,oti.*,ot."no" as "tray_no",ot."state",
             sp."no" as "package_no",sp."name" as "package_desc"
         FROM wms_structural_package_order o
         INNER JOIN wms_structural_package_order_tray_item oti ON o."id"=oti.order_id
+        LEFT JOIN wms_structural_package_order_tray ot ON oti.tray_id=ot."id"
         LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"
         LEFT JOIN wms_material m ON oti.material_no=m."no" and oti."version"=m."version"
         where o.id=#{orderId}