From 5fdecf7cfa8086ff85caa5f244a13391e639f201 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 3 Dec 2025 16:10:13 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-03=20chooseList=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/entity/Chooselist.java       | 12 +++++
 .../InboundNotificationDetailMapper.xml       | 44 +++++--------------
 .../OutboundNotificationDetailMapper.xml      | 27 +++++-------
 3 files changed, 32 insertions(+), 51 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/base/entity/Chooselist.java b/src/main/java/com/gaotao/modules/base/entity/Chooselist.java
index 8588be7..722ad82 100644
--- a/src/main/java/com/gaotao/modules/base/entity/Chooselist.java
+++ b/src/main/java/com/gaotao/modules/base/entity/Chooselist.java
@@ -21,10 +21,22 @@ public class Chooselist implements Serializable {
 
     private String caption4;
 
+    private String caption5;
+
+    private String caption6;
+
+    private String caption7;
+
     private String fieldname1;
 
     private String fieldname2;
 
+    private String fieldname3;
+
+    private String fieldname4;
+
+    private String fieldname5;
+
     @TableField(exist = false)
     private String conditionSql;
 
diff --git a/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml b/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml
index 972e3f1..1bfbc2b 100644
--- a/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml
+++ b/src/main/resources/mapper/inboundNotification/InboundNotificationDetailMapper.xml
@@ -151,40 +151,16 @@
         AND site = #{list[0].site} and bu_no = #{list[0].buNo} and order_no = #{list[0].orderNo}
     </update>
 
-    <select id="getInboundDetail2" resultType="com.gaotao.modules.trans.entity.TransDetailSub">
-<!--        select-->
-<!--            de.site,-->
-<!--            de.orderRef2,-->
-<!--            sub.subNo,-->
-<!--            sub.subQty,-->
-<!--            isnull(WareHouseName, sub.OrderRef4) as OrderRef4,-->
-<!--            isnull(LocationName, sub.OrderRef5) as OrderRef5,-->
-<!--            UserID as userId,-->
-<!--            UserName as userName,-->
-<!--            He.TransDate-->
-<!--        from TransHeader He-->
-<!--        inner join TransDetail de ON He.Site = de.site and He.OrderRef2 = de.orderRef2 and He.TransNo = de.transNo-->
-<!--        inner join TransDetailSub sub on de.site = sub.site and de.transNo = sub.transNo and de.orderRef2 = sub.orderRef2 and de.itemNo = sub.itemNo-->
-<!--        left join  WareHouse wa on wa.Site = sub.site and wa.bu_no = sub.OrderRef2 and wa.WareHouseID = sub.OrderRef4-->
-<!--        left join  Location lo on lo.Site = sub.site and lo.bu_no = sub.OrderRef2 and lo.WareHouseID = sub.OrderRef4 and lo.LocationID = sub.OrderRef5-->
-<!--        where de.site = #{site} and de.orderRef2 = #{buNo} AND he.orderRef1 = #{orderNo} and de.partNo = #{partNo}-->
-
-        select
-            A.site,
-            A.bu_no AS orderRef2,
-            A. roll_no AS subNo,
-            A. roll_qty AS subQty,
-            isnull(WareHouseName, A.warehouse_id) as OrderRef4,
-            isnull(LocationName, A.location_id) as OrderRef5,
-            transaction_by as userId,
-            C.user_display as userName,
-            A.transaction_date AS TransDate
-        from  StockTransactionLog  A
-        left join WareHouse wa on wa.Site = A.site and wa.bu_no = A.bu_no and wa.WareHouseID = A.warehouse_id
-        left join Location lo on lo.Site = A.site and lo.bu_no = A.bu_no and lo.WareHouseID = A.warehouse_id and lo.LocationID = A.location_id
-        LEFT JOIN sys_user C ON A.site = C.site AND C.username = A.transaction_by
-        where  A.site = #{site} and A.bu_no = #{buNo} AND A.document_type = #{orderType}
-          AND A.document_no = #{orderNo} AND A.order_no = #{relatedOrderNo} AND A.order_line_no = #{relatedOrderLineNo}
+    <select id="getInboundDetail2" resultType="com.gaotao.modules.trans.entity.TransDetailSub" statementType="CALLABLE">
+        {call GetWarehouseEntryAndExitDetails(
+            #{site, mode=IN, jdbcType=VARCHAR},
+            #{buNo, mode=IN, jdbcType=VARCHAR},
+            #{orderNo, mode=IN, jdbcType=VARCHAR},
+            #{orderType, mode=IN, jdbcType=VARCHAR},
+            #{relatedOrderNo, mode=IN, jdbcType=VARCHAR},
+            #{relatedOrderLineNo, mode=IN, jdbcType=VARCHAR},
+            #{partNo, mode=IN, jdbcType=VARCHAR}
+        )}
     </select>
 
     <select id="getInboundShopOrderList" resultType="com.gaotao.modules.inboundNotification.entity.vo.InboundNotificationDetailVo">
diff --git a/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml b/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml
index 21647cc..decdb48 100644
--- a/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml
+++ b/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml
@@ -151,23 +151,16 @@
         AND site = #{list[0].site} and bu_no = #{list[0].buNo} and order_no = #{list[0].orderNo}
     </update>
 
-    <select id="getOutboundDetail2" resultType="com.gaotao.modules.trans.entity.TransDetailSub">
-        select
-            A.site,
-            A.bu_no AS orderRef2,
-            A. roll_no AS subNo,
-            A. roll_qty AS subQty,
-            isnull(WareHouseName, A.warehouse_id) as OrderRef4,
-            isnull(LocationName, A.location_id) as OrderRef5,
-            transaction_by as userId,
-            C.user_display as userName,
-            A.transaction_date AS TransDate
-        from  StockTransactionLog  A
-        left join WareHouse wa on wa.Site = A.site and wa.bu_no = A.bu_no and wa.WareHouseID = A.warehouse_id
-        left join Location lo on lo.Site = A.site and lo.bu_no = A.bu_no and lo.WareHouseID = A.warehouse_id and lo.LocationID = A.location_id
-        LEFT JOIN sys_user C ON A.site = C.site AND C.username = A.transaction_by
-        where  A.site = #{site} and A.bu_no = #{buNo} AND A.document_type = #{orderType}
-          AND A.document_no = #{orderNo} AND A.order_no = #{relatedOrderNo} AND A.order_line_no = #{relatedOrderLineNo}
+    <select id="getOutboundDetail2" resultType="com.gaotao.modules.trans.entity.TransDetailSub" statementType="CALLABLE">
+        {call GetWarehouseEntryAndExitDetails(
+            #{site, mode=IN, jdbcType=VARCHAR},
+            #{buNo, mode=IN, jdbcType=VARCHAR},
+            #{orderNo, mode=IN, jdbcType=VARCHAR},
+            #{orderType, mode=IN, jdbcType=VARCHAR},
+            #{relatedOrderNo, mode=IN, jdbcType=VARCHAR},
+            #{relatedOrderLineNo, mode=IN, jdbcType=VARCHAR},
+            #{partNo, mode=IN, jdbcType=VARCHAR}
+        )}
     </select>
 
     <select id="getOutboundShopOrderList" resultType="com.gaotao.modules.outboundNotification.entity.vo.OutboundNotificationDetailVo">