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() + .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 -