From 10ade08bd530b7ee6b5dd83194c8f48d19b327ef Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期四, 11 四月 2024 13:36:50 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/OrderDetlMapper.xml                 |   33 ++++++++++++++++++++++++---------
 src/main/resources/mapper/LocMastMapper.xml                   |    2 +-
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    6 ++++++
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 354b926..b222e61 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -92,6 +92,12 @@
             throw new CoolException(param.getBarcode() + "鏁版嵁宸茬粡鍦ㄥ簱");
         }
 
+        //鍒ゆ柇鎵樼洏鏄惁宸茬粡鍦ㄥ伐浣滄。
+        if (wrkMastService.selectCount(new EntityWrapper<WrkMast>()
+                .eq("barcode", param.getBarcode())) > 0) {
+            throw new CoolException(param.getBarcode() + "鏁版嵁宸茬粡鍦ㄤ换鍔℃。涓�");
+        }
+
         //鍒ゆ柇鏄惁瀛樺湪鏂欑鐮� => 瀛樺湪鏂欑鐮佸垯瑕佹眰鎻愪氦涓婃潵鐨勭墿鏂檒ist蹇呴』鍏ㄩ儴閮芥湁鏂欑鐮�
         boolean hasContainerCode = false;
         int containerCodeCount = 0;//鏂欑鐮佹暟閲�
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 9182d35..b6fc93c 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -167,7 +167,7 @@
         update asr_loc_mast set loc_sts = 'S'
         where row1 >=1 and row1 &lt;= 16
         and bay1 in(21,22,23,37,38,39,56,57,58)
-        and lev1 >= 3 and lev1 &lt;= 10
+        and lev1 >= 1 and lev1 &lt;= 10
         and loc_sts = 'O'
     </delete>
 </mapper>
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index b1ffd1a..66c456b 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -85,15 +85,30 @@
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}
-        <if test="batch!=null and batch!='' ">
-            and batch = #{batch}
-        </if>
-        <if test="csocode!=null and csocode!='' ">
-            and three_code = #{csocode}
-        </if>
-        <if test="isocode!=null and isocode!='' ">
-            and dead_time = #{isocode}
-        </if>
+        <choose>
+            <when test="batch != null and batch != ''">
+                and batch = #{batch}
+            </when>
+            <otherwise>
+                and (batch IS NULL OR batch = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="csocode != null and csocode != ''">
+                and three_code = #{csocode}
+            </when>
+            <otherwise>
+                and (three_code IS NULL OR three_code = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="isocode != null and isocode != ''">
+                and dead_time = #{isocode}
+            </when>
+            <otherwise>
+                and (dead_time IS NULL OR dead_time = '')
+            </otherwise>
+        </choose>
     </select>
 
     <select id="selectItemNoneOfBatch" resultMap="BaseResultMap">

--
Gitblit v1.9.1