From d1a21b211f7965d3a2ccde249cd980f1015e8f21 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 01 十二月 2022 11:16:40 +0800
Subject: [PATCH] #现场实际无库位的库位号封禁

---
 src/main/resources/mapper/LocDetlMapper.xml |   61 +++++++++++++++---------------
 1 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index feaf239..9e038ac 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -98,7 +98,7 @@
             and a.anfme like '%' + #{anfme} + '%'
         </if>
         <if test="batch!=null and batch!='' ">
-            and a.batch like  #{batch}
+            and a.batch like  '%' + #{batch} + '%'
         </if>
         <if test="startTime!=null and endTime!=null">
             and a.modi_time between #{startTime} and #{endTime}
@@ -111,14 +111,14 @@
     <select id="getStockOutPage" resultMap="BaseResultMap">
         select * from
         (
-            select
-            ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row,
-            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'
-            <include refid="stockOutCondition"></include>
+        select
+        ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row,
+        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'
+        <include refid="stockOutCondition"></include>
         ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
     </select>
 
@@ -135,19 +135,19 @@
     <select id="getStockStatis" resultType="com.zy.asrs.entity.LocDetl">
         select * from
         (
-            select
-            ROW_NUMBER() over (order by sum(a.anfme) desc) as row
-            , a.matnr
-            , sum(a.anfme) as anfme
-            from asr_loc_detl a
-            where 1=1
-            <include refid="stockOutCondition"></include>
-            group by a.matnr
-         ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+        select
+        ROW_NUMBER() over (order by sum(a.anfme) desc) as row
+        , a.matnr
+        , sum(a.anfme) as anfme
+        from asr_loc_detl a
+        where 1=1
+        <include refid="stockOutCondition"></include>
+        group by a.matnr
+        ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
     </select>
 
     <select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer">
-     select count(1) as count from
+        select count(1) as count from
         (
         select
         a.matnr
@@ -155,7 +155,7 @@
         where 1=1
         <include refid="stockOutCondition"></include>
         group by a.matnr
-     ) b
+        ) b
     </select>
 
     <select id="getStockStatisExcel" resultType="com.zy.asrs.entity.LocDetl">
@@ -205,14 +205,14 @@
         where 1=1
         and b.loc_sts = 'F'
         and a.matnr = #{matnr}
-<!--        <choose>-->
-<!--            <when test="batch != null and batch != ''">-->
-<!--                and a.batch = #{batch}-->
-<!--            </when>-->
-<!--            <otherwise>-->
-<!--                and (a.batch IS NULL OR a.batch = '')-->
-<!--            </otherwise>-->
-<!--        </choose>-->
+        <!--        <choose>-->
+        <!--            <when test="batch != null and batch != ''">-->
+        <!--                and a.batch = #{batch}-->
+        <!--            </when>-->
+        <!--            <otherwise>-->
+        <!--                and (a.batch IS NULL OR a.batch = '')-->
+        <!--            </otherwise>-->
+        <!--        </choose>-->
         <if test="batch != null and batch != ''">
             and a.batch = #{batch}
         </if>
@@ -287,8 +287,8 @@
 
     <select id="queryStockAnfme" resultType="java.lang.Double">
         select sum(anfme) as count from man_loc_detl
-         where 1=1
-         and matnr = #{matnr}
+        where 1=1
+        and matnr = #{matnr}
         <if test="batch != null and batch != ''">
             and batch = #{batch}
         </if>
@@ -322,4 +322,5 @@
         where loc_no=#{locNo}
     </select>
 
+
 </mapper>

--
Gitblit v1.9.1