From 3e104b11f2f19c636d4d6bc19940ed60fff2828b Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Fri, 26 Jul 2024 15:53:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=80=80=E8=B4=A7=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=A1=81=E6=9E=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iostorInv/util/impl/InBoxManageServiceImpl.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 9db71b309..68c972c91 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
@@ -319,8 +319,21 @@ public class InBoxManageServiceImpl implements InBoxManageService {
         /*
          * 查询mes木箱信息，插入木箱信息表
          */
+
+        JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("box_no") + "' AND status = '0'").getResultJSONArray(0);
+        if (ObjectUtil.isEmpty(resultJSONArray)) {
+            throw new BadRequestException("未查询到子卷包装信息!");
+        }
+
         lmsToMesService.momGetPackingInfo(whereJson);
 
+        //判断当前点位是否存在任务，如果存在则不生成任务
+        WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
+        JSONObject jsonObject = wo_Task.query("point_code1 = '" + whereJson.getString("point_code") + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(jsonObject)) {
+            throw new BadRequestException("点位【" + jsonObject.getString("point_code1") + "】存在未完成的任务！");
+        }
+
 
         //查询对应的木箱信息
         // 查询木箱信息