From e9e62abb618d334d6999102ec20c49d38df587e6 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 15 十月 2025 13:10:48 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocDetlMapper.xml |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index df57488..c6ccebc 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -188,6 +188,12 @@
         <if test="bomCode!=null and bomCode!='' ">
             and a.bom_code like '%' + #{bomCode} + '%'
         </if>
+        <if test="threeCode!=null and threeCode!='' ">
+            and a.three_code like '%' + #{threeCode} + '%'
+        </if>
+        <if test="orderNo!=null and orderNo!='' ">
+            and a.order_no like '%' + #{orderNo} + '%'
+        </if>
     </sql>
 
     <select id="getStockOutPage" resultMap="BaseResultMap">
@@ -244,6 +250,8 @@
         select
         ROW_NUMBER() over (order by sum(a.anfme) desc) as row
         , a.matnr
+        , min(a.maktx) as maktx
+        , min(a.specs) as specs
         , sum(a.anfme) as anfme
         from asr_loc_detl a
         where 1=1
@@ -295,7 +303,7 @@
 <!--                and (a.batch IS NULL OR a.batch = '')-->
 <!--            </otherwise>-->
 <!--        </choose>-->
-        <if test="batch != null">
+        <if test="batch != null and batch != ''">
             and a.batch = #{batch}
         </if>
         <if test="orderNo != null and orderNo != ''">
@@ -310,7 +318,7 @@
         </if>
 
         order by
-        DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+        DATEPART(yyyy,a.appe_time),DATEPART(mm,a.appe_time),DATEPART(dd,a.appe_time), a.anfme
         desc,
         NEWID(),
         case

--
Gitblit v1.9.1