From be3615938627fb4c7865fc23174d51d84cbb0ab5 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Sun, 2 Mar 2025 10:22:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=AA=8C=E7=AE=B1?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=97=B6=E6=B7=B1=E6=B5=85=E8=B4=A7=E4=BD=8D?=
 =?UTF-8?q?=E9=94=81=E5=AE=9A=EF=BC=8C=E5=85=88=E4=B8=8B=E6=B7=B1=E8=B4=A7?=
 =?UTF-8?q?=E4=BD=8D=E5=AF=BC=E8=87=B4=E6=8A=A5=E8=AD=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PdmBiSubpackagerelationServiceImpl.java   | 29 ++++++++++++-------
 .../util/impl/OutBoxManageServiceImpl.java    |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index ea154657a..b87243f95 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -372,6 +372,15 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             throw new BadRequestException("当前木箱"+boxSn+"库存信息查询不到,请确认");
         }
         JSONObject boxAttr  = boxAttrs.getJSONObject(0);
+
+        int hasTask = taskService.count(new QueryWrapper<SchBaseTask>()
+                .eq("is_delete", "0")
+                .eq("point_code1", boxAttr.getString("struct_code"))
+                .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
+        if (hasTask>0){
+            throw new BadRequestException("当前空木箱"+boxSn+"存在正在执行的任务,稍后再操作");
+        }
+
         String task_group_id = null;
         if (boxAttr.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("深"))) {
             JSONObject 浅Attr = attrTab
@@ -383,20 +392,20 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
                 if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
                     // 判断浅货位木箱和深货位木箱是否相同规格
                     task_group_id = outBoxManageService.createBoxMove(浅Attr);
-                } else if(!浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("木箱出库锁"))) {
-                    // 判断是否是空木箱出库锁
+                } else if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("验箱出库锁"))) {
+                    int 浅Task = taskService.count(new QueryWrapper<SchBaseTask>()
+                            .eq("is_delete", "0")
+                            .eq("point_code1", 浅Attr.getString("struct_code"))
+                            .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
+                    if (浅Task == 0){
+                        task_group_id = outBoxManageService.createBoxMove(浅Attr);
+                    }
+                }else {
                     throw new BadRequestException("当前木箱所在货位"+boxAttr.getString("struct_code")+"对应浅货位存在任务"+浅Attr.getString("task_code"));
                 }
             }
         }
-        int moveTask = taskService.count(new QueryWrapper<SchBaseTask>()
-                .eq("task_type", "010704")
-                .eq("is_delete", "0")
-                .eq("point_code1", boxAttr.getString("struct_code"))
-                .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
-        if (moveTask>0){
-            throw new BadRequestException("当前子卷已经装箱入库");
-        }
+
         // 生成任务
         JSONObject jsonTaskParam = new JSONObject();
         jsonTaskParam.put("task_type", "010704");
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
index 3c42fe5be..131d7a9dd 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
@@ -211,7 +211,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
             throw new BadRequestException("此木箱没有绑定托盘号!"+jsonAttr.getString("storagevehicle_code"));
         }
         // 锁定起点
-        jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("木箱出库锁"));
+        jsonAttr.put("lock_type", IOSEnum.LOCK_TYPE.code("验箱出库锁"));
         attrTab.update(jsonAttr);
         // 清空缓存
         notOutRowList.clear();