From cc490f6c02f994cfec1028de342e410f3aa2bc82 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 17 八月 2022 17:02:40 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index dfff812..d4ea587 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -196,8 +196,10 @@
         select a.*
         from asr_loc_detl a
         left join asr_loc_mast b on a.loc_no = b.loc_no
+--         left join asr_bas_crnp c on b.crn_no = c.crn_no
         where 1=1
         and b.loc_sts = 'F'
+--         and c.out_enable = 'Y'
         and a.matnr = #{matnr}
 <!--        <choose>-->
 <!--            <when test="batch != null and batch != ''">-->
@@ -211,22 +213,21 @@
             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">
-            and b.loc_no not in
-            <foreach item="item" collection="locNos" index="index"  separator="," open="(" close=")">
-                #{item}
-            </foreach>
-        </if>
+<!--        <if test="locNos != null and locNos.size > 0">-->
+<!--            and b.loc_no not in-->
+<!--            <foreach item="item" collection="locNos" index="index"  separator="," open="(" close=")">-->
+<!--                #{item}-->
+<!--            </foreach>-->
+<!--        </if>-->
 
         order by
         DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
         desc,
-        NEWID(),
+        a.loc_no,
         case
-        when (left(a.loc_no, 2) = '01') then 0
         when (left(a.loc_no, 2) = '02') then 1
         when (left(a.loc_no, 2) = '03') then 1
         when (left(a.loc_no, 2) = '04') then 0
@@ -256,24 +257,6 @@
         when (left(a.loc_no, 2) = '28') then 0
         when (left(a.loc_no, 2) = '29') then 0
         when (left(a.loc_no, 2) = '30') then 1
-        when (left(a.loc_no, 2) = '31') then 1
-        when (left(a.loc_no, 2) = '32') then 0
-        when (left(a.loc_no, 2) = '33') then 0
-        when (left(a.loc_no, 2) = '34') then 1
-        when (left(a.loc_no, 2) = '35') then 1
-        when (left(a.loc_no, 2) = '36') then 0
-        when (left(a.loc_no, 2) = '37') then 0
-        when (left(a.loc_no, 2) = '38') then 1
-        when (left(a.loc_no, 2) = '39') then 1
-        when (left(a.loc_no, 2) = '40') then 0
-        when (left(a.loc_no, 2) = '41') then 0
-        when (left(a.loc_no, 2) = '42') then 1
-        when (left(a.loc_no, 2) = '43') then 1
-        when (left(a.loc_no, 2) = '44') then 0
-        when (left(a.loc_no, 2) = '45') then 0
-        when (left(a.loc_no, 2) = '46') then 1
-        when (left(a.loc_no, 2) = '47') then 1
-        when (left(a.loc_no, 2) = '48') then 0
         else 0
         end
         desc

--
Gitblit v1.9.1