From 98f26916cc3ec5e53e4d096f22dab24d6291ca02 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Tue, 29 Apr 2025 14:56:28 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=AD=90=E5=8D=B7=E8=A7=A3=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E7=BB=8F=E8=A3=85=E7=AE=B1=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8D=E5=85=81=E8=AE=B8=E8=A7=A3=E7=BB=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PdmBiSubpackagerelationServiceImpl.java | 9 +++++++++
 lms/nladmin-system/src/main/resources/logback-spring.xml | 1 -
 2 files changed, 9 insertions(+), 1 deletion(-)

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 5d070b85b..3165efe58 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
@@ -783,6 +783,15 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
             JSONObject attr = attrTab.query("storagevehicle_code = '" + packageBoxSn + "'").uniqueResult(0);
             if (ObjectUtils.isNotEmpty(attr)){
+                String structCode = attr.getString("struct_code");
+                int count = taskService.count(new QueryWrapper<SchBaseTask>()
+                        .eq("task_type", "010704")
+                        .eq("is_delete", "0")
+                        .eq("point_code1", structCode)
+                        .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
+                if (count>0){
+                    throw new BadRequestException("当前子卷已经生成装箱入库任务,不允许直接解绑");
+                }
                 attr.put("lock_type","1");
                 attrTab.update(attr);
             }
diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml
index 9a7897e83..040e763ef 100644
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -134,7 +134,6 @@ https://juejin.cn/post/6844903775631572999
         <root level="info">
             <appender-ref ref="asyncFileAppender"/>
             <appender-ref ref="asyncLuceneAppender"/>
-            <appender-ref ref="CONSOLE"/>
         </root>
         <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>