From c5c3e50b607d85ac81165b56a20025ee71b00a71 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Tue, 21 Oct 2025 11:13:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=85=A5=E7=83=98?=
 =?UTF-8?q?=E7=AE=B1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/iostorInv/util/impl/InBoxManageServiceImpl.java  | 2 +-
 .../main/java/org/nl/wms/pda/mps/rest/BakingController.java  | 3 ++-
 .../main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
index b848cc138..63d983679 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
@@ -717,7 +717,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
 
         JSONObject jsonAttr = new JSONObject();
 
-        RLock lock = redissonClient.getLock("getEmptyBox-----"+block_num);
+        RLock lock = redissonClient.getLock("getEmptyBox");
         boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
         try {
             if (tryLock) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java
index 5309aa739..d308bb8e4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java
@@ -1,5 +1,6 @@
 package org.nl.wms.pda.mps.rest;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -25,7 +26,7 @@ public class BakingController {
 
     @PostMapping("/ovenInAndOut")
     @Log("烘箱出入")
-
+@SaIgnore
     public ResponseEntity<Object> queryRawFoil(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(bakingService.ovenInAndOut(whereJson), HttpStatus.OK);
     }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
index d54e16d12..a0c253c9c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
@@ -85,7 +85,7 @@
                         IFNULL(po.material_code,'') = ''
                     ENDOPTION
                     OPTION 输入.mater_flag = "1"
-                        IFNULL(po.material_code,'') = ''
+                            IFNULL(po.material_code,'') = ''
                     ENDOPTION
                     UNION
                 	SELECT
@@ -308,6 +308,9 @@
                     ENDOPTION
                     OPTION 输入.point_type <> ""
                         p.point_type = 输入.point_type
+                    ENDOPTION
+                    OPTION 输入.cant_location <> ""
+                        p.point_location not in 输入.cant_location
                     ENDOPTION
                 	AND p.point_type = '4'
                 	AND p.point_status = '1'