From c7a1cb31e2c22a49fa3b9d2c94e12db02793f291 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 4 Apr 2025 23:10:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/collect/IoCollectOrderCodeManController.java   | 4 ++--
 .../com/glxp/api/controller/inout/IoCodeTempController.java   | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
index 2d8ea3721..a7abc4751 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
@@ -76,7 +76,7 @@ public class IoCollectOrderCodeManController extends BaseController {
      * @return
      */
     @PostMapping("/udiwms/ioSplit/collect/order/tagCode")
-    @CusRedissonAnnotation(cacheName = RedissonCacheKey.PRESCRIBE_ADD_CODE, key = {"#addTagCodeReqeust.billNo", "#addTagCodeReqeust.code"}, waitTime = 1, leaseTime = 6, timeOutMsg = "扫码重复提交")
+    @CusRedissonAnnotation(cacheName = RedissonCacheKey.PRESCRIBE_ADD_CODE, key = {"#addTagCodeReqeust.billNo", "#addTagCodeReqeust.code"}, waitTime = 1, leaseTime = 3, timeOutMsg = "扫码重复提交")
     public BaseResponse prescribeTagCode(@RequestBody @Valid AddTagCodeReqeust addTagCodeReqeust,
                                          BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -133,7 +133,7 @@ public class IoCollectOrderCodeManController extends BaseController {
      * @return
      */
     @PostMapping("/udiwms/ioSplit/collect/order/batchAddCode")
-    @CusRedissonAnnotation(cacheName = RedissonCacheKey.PRESCRIBE_BATCH_CODE, key = {"#addTagCodeReqeust.billNo", "#addTagCodeReqeust.codeList", "#addTagCodeReqeust.code"}, leaseTime = 6, timeOutMsg = "扫码重复提交")
+    @CusRedissonAnnotation(cacheName = RedissonCacheKey.PRESCRIBE_BATCH_CODE, key = {"#addTagCodeReqeust.billNo", "#addTagCodeReqeust.codeList", "#addTagCodeReqeust.code"}, leaseTime = 3, timeOutMsg = "扫码重复提交")
     public BaseResponse batchAddCode(@RequestBody @Valid AddTagCodeReqeust addTagCodeReqeust,
                                      BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 4027dc776..cc893104c 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -368,7 +368,7 @@ public class IoCodeTempController extends BaseController {
     }
 
     @AuthRuleAnnotation("")
-    @CusRedissonAnnotation(cacheName = RedissonCacheKey.ENTER_CODE_VAIL, key = { "#addEnterCodeRequest.codeList"}, timeOutMsg = "重复扫码")
+    @CusRedissonAnnotation(cacheName = RedissonCacheKey.ENTER_CODE_VAIL, key = {"#addEnterCodeRequest.codeList"}, timeOutMsg = "重复扫码")
     @PostMapping("warehouse/inout/batchVailCode")
     public BaseResponse batchVailCode(@RequestBody @Valid AddEnterCodeRequest addEnterCodeRequest) {
         List<String> codeList = addEnterCodeRequest.getCodeList();
@@ -1167,7 +1167,6 @@ public class IoCodeTempController extends BaseController {
                 }
             }
 
-
             BaseResponse baseResponse = checkRelId(codeEnttity, unitFk);
             if (baseResponse != null) {
                 deleteEmptyBillNo(orderEntity);
@@ -1186,7 +1185,6 @@ public class IoCodeTempController extends BaseController {
                 return baseResponse;
             }
 
-
             if (IntUtil.value(bussinessTypeEntity.getUseDyCount()) == 2) {
                 if (bussinessTypeEntity.isScanPreIn() && checkDiAttribute(bussinessTypeEntity, udiRelevanceResponse.getId(), 2)) {    //校验预验收库存
                     BaseResponse invRes = checkInvService.checkPreInInv(bussinessTypeEntity, codeEnttity, false);