From 4e2b44115f857b1172521b7a29bc51afc357d819 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期三, 30 十一月 2022 08:32:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'aliyun/hylyasrs' into hylyasrs

---
 src/main/resources/mapper/LocDetlMapper.xml |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index dfff812..330d26f 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -100,6 +100,9 @@
         <if test="startTime!=null and endTime!=null">
             and a.modi_time between #{startTime} and #{endTime}
         </if>
+        <if test="crnNo!=null and crnNo!='' ">
+            and b.crn_no=#{crnNo}
+        </if>
     </sql>
 
     <select id="getStockOutPage" resultMap="BaseResultMap">
@@ -211,7 +214,7 @@
             and a.batch = #{batch}
         </if>
         <if test="orderNo != null and orderNo != ''">
-            and a.orderNo = #{orderNo}
+            and a.order_no = #{orderNo}
         </if>
 
         <if test="locNos != null and locNos.size > 0">
@@ -279,6 +282,18 @@
         desc
     </select>
 
+    <select id="queryStockOther" resultMap="BaseResultMap">
+            select a.*
+    from asr_loc_detl a
+    left join asr_loc_mast b on a.loc_no = b.loc_no
+    where 1=1
+    and b.loc_sts = 'F'
+    and a.matnr=  #{matnr}
+    <if test="locNo !=null and locNo !=''">
+    and a.loc_no !=  #{locNo}
+    </if>
+
+    </select>
     <select id="queryStockAnfme" resultType="java.lang.Double">
         select sum(anfme) as count from man_loc_detl
          where 1=1
@@ -310,5 +325,11 @@
             batch LIKE '%[a-z]%'
     </select>
 
+    <select id="selectLocDetlSumQty" resultType="double">
+        select SUM(anfme) anfme
+        from asr_loc_detl
+        where loc_no=#{locNo}
+    </select>
+
 
 </mapper>

--
Gitblit v1.9.1