From 207823b94f5627fae49d29b51b5ce7186a70c8e0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 04 一月 2025 09:59:48 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index f20e07e..900ece5 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -148,14 +148,14 @@
         left join asr_loc_mast_man_node_merge b on a.loc_no = b.loc_no
         where 1=1
         and b.loc_sts = 'F'
-        <choose>
-            <when test="owner != null and owner != 0">
-                and owner = #{owner}
-            </when>
-            <otherwise>
-                and 1!=1
-            </otherwise>
-        </choose>
+<!--        <choose>-->
+<!--            <when test="owner != null and owner != 0">-->
+<!--                and owner = #{owner}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                and 1!=1-->
+<!--            </otherwise>-->
+<!--        </choose>-->
 <!--        <choose>-->
 <!--            <when test="payment != null and payment != 0">-->
 <!--                and payment = #{payment}-->
@@ -175,14 +175,14 @@
         left join asr_loc_mast_man_node_merge b on a.loc_no = b.loc_no
         where 1=1
         and b.loc_sts = 'F'
-        <choose>
-            <when test="owner != null and owner != 0">
-                and owner = #{owner}
-            </when>
-            <otherwise>
-                and 1!=1
-            </otherwise>
-        </choose>
+<!--        <choose>-->
+<!--            <when test="owner != null and owner != 0">-->
+<!--                and owner = #{owner}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                and 1!=1-->
+<!--            </otherwise>-->
+<!--        </choose>-->
 <!--        <choose>-->
 <!--            <when test="payment != null and payment != 0">-->
 <!--                and payment = #{payment}-->
@@ -278,14 +278,14 @@
 <!--            </otherwise>-->
 <!--        </choose>-->
 
-        <choose>
-            <when test="owner != null and owner !=0">
-                and a.owner = #{owner}
-            </when>
-            <otherwise>
-                and 1!=1
-            </otherwise>
-        </choose>
+<!--        <choose>-->
+<!--            <when test="owner != null and owner !=0">-->
+<!--                and a.owner = #{owner}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                and 1!=1-->
+<!--            </otherwise>-->
+<!--        </choose>-->
 
         order by
         DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
@@ -448,14 +448,14 @@
         <!--            </otherwise>-->
         <!--        </choose>-->
 
-        <choose>
-            <when test="owner != null and owner !=0">
-                and a.owner = #{owner}
-            </when>
-            <otherwise>
-                and 1!=1
-            </otherwise>
-        </choose>
+<!--        <choose>-->
+<!--            <when test="owner != null and owner !=0">-->
+<!--                and a.owner = #{owner}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                and 1!=1-->
+<!--            </otherwise>-->
+<!--        </choose>-->
 
         order by
         a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
@@ -652,24 +652,24 @@
         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="owner != null and owner !=0">
-                and a.owner = #{owner}
+            <when test="batch != null and batch != ''">
+                and a.batch = #{batch}
             </when>
             <otherwise>
-                and 1!=1
+                and (a.batch IS NULL OR a.batch = '')
             </otherwise>
         </choose>
 
+<!--        <choose>-->
+<!--            <when test="owner != null and owner !=0">-->
+<!--                and a.owner = #{owner}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                and 1!=1-->
+<!--            </otherwise>-->
+<!--        </choose>-->
+
         order by
         a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
         desc,

--
Gitblit v1.9.1