From bf8e9baea9da29978e86103634b982d0c0fe0d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 24 Mar 2026 17:09:20 +0800
Subject: [PATCH] =?UTF-8?q?refactor(repository):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=8C=96=E5=8C=85=E8=A3=85=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=89=98=E7=9B=98=E9=A1=B9=E5=AE=9E=E4=BD=93=E5=92=8C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 WmsStructuralPackageOrderTrayItem 实体中的图片和图号字段
- 修改 getListByTrayId 查询方法，添加物料表关联并获取图片和图号信息
- 更新 SQL 查询语句以从物料表获取图片和图号数据
- 保持 getSimpleListByTrayNo 方法的基本查询逻辑不变
---
 .../WmsStructuralPackageOrderTrayItem.java     | 18 +++++++++---------
 ...WmsStructuralPackageOrderTrayItemMapper.xml |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrderTrayItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrderTrayItem.java
index a9227dc3..ee8c4443 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrderTrayItem.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrderTrayItem.java
@@ -74,15 +74,15 @@ public class WmsStructuralPackageOrderTrayItem implements Serializable {
      */
     private BigDecimal storeNum;
 
-    /**
-     * 图片
-     */
-    private String image;
-
-    /**
-     * 图号
-     */
-    private String drawingNo;
+//    /**
+//     * 图片
+//     */
+//    private String image;
+//
+//    /**
+//     * 图号
+//     */
+//    private String drawingNo;
 
     /**
      * 线下交货原因
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
index fa276d42..a387381b 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayItemMapper.xml
@@ -3,18 +3,18 @@
 <mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageOrderTrayItemMapper">
 
     <select id="getListByTrayId" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemVO">
-        SELECT ROW_NUMBER() OVER (ORDER BY o.id) AS "index",oti.*,ot."no" as "tray_no",ot."state",sp."no" as "package_no"
-            ,sp."name" as "package_desc"
+        SELECT ROW_NUMBER() OVER (ORDER BY o.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_tray ot
         INNER JOIN wms_structural_package_order_tray_item oti ON ot."id"=oti.tray_id
         INNER JOIN wms_structural_package_order o ON o."id"=ot.order_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 ot.id=#{id}
         order by o.id
     </select>
 
-    <select id="getSimpleListByTrayNo"
-            resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemSimpleVO">
+    <select id="getSimpleListByTrayNo" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayItemSimpleVO">
         select oti.*
         from wms_structural_package_order_tray ot
         inner join wms_structural_package_order_tray_item oti on ot."id"=oti.tray_id