From d8a4d458cf3f8c8472150822ad8d734960158c97 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 26 十月 2022 13:19:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 4 ++--
src/main/resources/mapper/LocMastMapper.xml | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index a46a44a..19a6980 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -82,8 +82,8 @@
} else {
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
-
- for (int i = 0; i<locNos.size(); i++) {
+ // 鍏ュ簱澶栧眰搴撲綅婊炵┖
+ for (int i = 0; i<locNos.size() - 1; i++) {
LocMast locMast = this.selectById(locNos.get(i));
if (locMast.getLocSts().equals("O")) {
if (i == 0) {
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