From ba8024b827f0ae2a42b5c060d0ca0cd62d8a4043 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 02 六月 2023 14:14:04 +0800
Subject: [PATCH] 入库深库位是否有非F、D、X库位进行校验

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    2 +-
 src/main/resources/mapper/WrkMastMapper.xml                 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index ff60848..c3852ac 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -940,7 +940,7 @@
                 continue;
             }
 
-            // 鍏ュ簱娣卞簱浣嶆槸鍚︽湁闈濬銆丏搴撲綅杩涜鏍￠獙
+            // 鍏ュ簱娣卞簱浣嶆槸鍚︽湁闈濬銆丏銆乆搴撲綅杩涜鏍￠獙
             if (wrkMastMapper.selectShallowLoc(Integer.parseInt(wrkMast.getLocNo().substring(0, 2)),Integer.parseInt(wrkMast.getLocNo().substring(2, 5)),Integer.parseInt(wrkMast.getLocNo().substring(5, 7)))!=null){
                 continue;
             }
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index a99ae2b..1a9ac77 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -250,7 +250,7 @@
         select top 1 *
         from dbo.asr_loc_mast
         where 1=1
-        and loc_sts!='F' and loc_sts!='D'
+        and loc_sts!='F' and loc_sts!='D' and loc_sts != 'X'
         and bay1 = #{bay}
         and lev1 = #{lev}
         <if test="row &lt;= 3">

--
Gitblit v1.9.1