From a99b88095349c58bb019dbf39f1ac91273da549c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 30 一月 2023 16:26:41 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocMastMapper.xml            |    2 +-
 src/main/java/com/zy/common/service/CommonService.java |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 406773f..81787fd 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -360,8 +360,12 @@
                 List<LocMast> locMasts1 = locMastService.queryFreeLocMastEnd0(locMast1.getBay1(), locMast1.getLev1(),locMast1.getRow1());
                 Integer innermostRow = Utils.getInnermostRow(locMasts1.get(0).getLocNo());
                 for (LocMast locMast2:locMasts1){
-                    if (locMast2.getRow1().equals(innermostRow)) {
-                        locMast = locMast2;
+                    if (locMast2.getLocSts().equals("O")){
+                        if (locMast2.getRow1().equals(innermostRow)) {
+                            locMast = locMast2;
+                            break;
+                        }
+                    }else if (!locMast2.getLocSts().equals("F")){
                         break;
                     }
                 }
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 438626c..f68296b 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -200,7 +200,7 @@
         from asr_loc_mast
         where bay1=#{bay}
         and lev1=#{lev}
-        and loc_sts='O'
+--         and loc_sts='O'
         and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
         <if test="row1 >= 1 and row1 &lt;= 3">
             and row1 >= 1 and row1 &lt;= 3

--
Gitblit v1.9.1