From 25f796e201672b349437e785b8bec76958d89dd5 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Thu, 12 Jun 2025 20:02:47 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E9=94=81=E5=8A=9B=E5=BA=A6=EF=BC=9B=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=87=8D=E5=A4=8D=E7=94=B3=E8=AF=B7=E6=97=B6=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=8D=E9=A6=88=E9=99=88=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BstIvtPackageinfoivtServiceImpl.java  | 18 +++---------------
 .../org/nl/common/utils/RedissonUtils.java     |  2 +-
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
index 1fc23da89..62a2ed76f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
@@ -184,7 +184,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
             }
             result.put("status", HttpStatus.OK.value());
             return null;
-        },"sendProductToFirstFloor",null);
+        },"sendProductToFirstFloor"+actionType,null);
         log.info("一楼装箱区点位二次分配" + taskCode + "---------------------------------------------" + result);
         return result;
     }
@@ -626,7 +626,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         if (actionType.equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
             if (StringUtils.isNotBlank(baseTask.getRequest_param())) {
                 if (baseTask.getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
-                    throw new BadRequestException(baseTask.getTask_code() + "取货完成失败" + ",该任务已发送过取货完成信号请勿频繁发送！");
+                    return;
                 }
             }
             if (baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("满轴缓存位->待检区")) ||
@@ -654,18 +654,6 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                     upDateIvtOrTask(baseTask, pointCode);
                 }
             }
-            //            else if ((baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")) ||
-            //                    baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")) ||
-            //                    baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区->管制区")) ||
-            //                    baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区")) ||
-            //                    baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区")) ||
-            //                    baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"))
-            //                    || baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务"))
-            //            )) {
-            //                //取货完成信号
-            //                upDateIvtOrTask(baseTask, baseTask.getPoint_code1());
-            //                handleGroupTask(baseTask);
-            //            }
             else if ((baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区")) ||
                     baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务"))
                     || baseTask.getTask_type().equals(PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务"))
@@ -678,7 +666,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
             //放货完成信号请求
             if (StringUtils.isNotBlank(baseTask.getCar_no())) {
                 if (baseTask.getCar_no().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("放货完成"))) {
-                    throw new BadRequestException(baseTask.getTask_code() + "放货完成失败" + ",该任务已发送过放货完成信号请勿频繁发送！");
+                    return;
                 }
             }
             //放货任务
diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
index 127941c1b..2b8e985c7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
+++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
@@ -32,7 +32,7 @@ public class RedissonUtils {
             if (isLock){
                 process.apply(param);
             } else {
-                return;
+               throw new BadRequestException(key+"当前业务正在执行中");
             }
         }catch (Exception ex){
             throw ex;