From 9880fb9c0d0a1445d7288d8b0022065cccfff3c0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 10:06:19 +0800
Subject: [PATCH] Merge branch 'ynasrs' of http://47.97.1.152:5880/r/zy-asrs into ynasrs

---
 src/main/resources/mapper/LocMastMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index bec71d6..bc2f802 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -66,7 +66,8 @@
                 <if test="locType1 != null">
                     and loc_type1 = #{locType1}
                 </if>
-                /*and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')*/
+                and loc_no not in ('0100101', '0100201', '0100301')
+                and bay1 != 1 and lev1 != 1
                 group by ctn_no
             ) a
             where count = #{rowsLen}

--
Gitblit v1.9.1