From 118d83c4768b58a42bc54ab73967f53b930b63d7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 23 四月 2022 13:12:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |    1 +
 src/main/resources/mapper/LocDetlMapper.xml              |   19 +++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6fe51c9..bc4c409 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -93,6 +93,7 @@
      * 娣诲姞鍑哄簱鍗�
      */
     @PostMapping("/order/pakout/new/default/v1")
+    @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
     public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakoutParam param) {
         auth(appkey, param);
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 28b911c..43ebc2f 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -199,14 +199,17 @@
         where 1=1
         and b.loc_sts = 'F'
         and a.matnr = #{matnr}
-        <choose>
-            <when test="batch != null and batch != ''">
-                and a.batch = #{batch}
-            </when>
-            <otherwise>
-                and (a.batch IS NULL OR a.batch = '')
-            </otherwise>
-        </choose>
+<!--        <choose>-->
+<!--            <when test="batch != null and batch != ''">-->
+<!--                and a.batch = #{batch}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                and (a.batch IS NULL OR a.batch = '')-->
+<!--            </otherwise>-->
+<!--        </choose>-->
+        <if test="batch != null and batch != ''">
+            and a.batch = #{batch}
+        </if>
         <if test="orderNo != null and orderNo != ''">
             and a.orderNo = #{orderNo}
         </if>

--
Gitblit v1.9.1