From e10ab1dabde821264b53ddda68161b77942a0447 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Wed, 17 Jun 2026 19:01:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86-=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F-=E9=92=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=AF=A6=E6=83=85=EF=BC=8C=E7=9B=B8=E5=90=8C?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9B=B8=E5=90=8C=E7=89=88=E6=9C=AC=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E8=AE=B0=E5=BD=95=E5=8F=96=E6=9C=80=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...msStructuralPackageOrderTrayItemMapper.xml | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
index 99eddd7f..b71b8846 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
@@ -23,15 +23,28 @@
     </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.*,ot."no" as "tray_no",ot."state",
-            sp."no" as "package_no",sp."name" as "package_desc"
+        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}
-        order by oti.id
+        LEFT JOIN wms_material m ON m."id" = (
+            SELECT m2."id" 
+            FROM wms_material m2 
+            WHERE m2."no" = oti.material_no 
+              AND m2."version" = oti."version"
+            ORDER BY m2."id" DESC 
+            LIMIT 1
+        )
+        WHERE o.id=#{orderId}
+        ORDER BY oti.id
     </select>
 
     <select id="getListVOByIds" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemVO">