From 948371a5a40ca26196f984dfedf44466179eb792 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Thu, 11 Sep 2025 16:21:41 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E7=8E=B0=E5=9C=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=BA=9B=E5=A4=84=E7=90=86=E4=B8=8E=E4=BC=98?= =?UTF-8?q?=E5=8C=96:=20=E5=85=88=E6=9C=89=E6=B5=85=E8=B4=A7=E4=BD=8D?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1=E6=9C=AA=E5=AE=8C=E6=88=90?= =?UTF-8?q?=EF=BC=8C=20=E5=90=8E=E6=9C=89=E6=B7=B1=E8=B4=A7=E4=BD=8D?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1=EF=BC=8C=E9=98=BB=E6=8C=A1?= =?UTF-8?q?=E5=90=8E=E7=94=9F=E6=88=90=E7=A7=BB=E5=BA=93=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=20=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B7=B2=E4=BF=AE=E5=A4=8D=EF=BC=9B?= =?UTF-8?q?=20=E6=96=99=E7=AE=B1=E5=BA=93=E6=8A=80=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8F=91=E7=A7=BB=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=9B=20=E6=8B=A3=E9=80=89=E4=BD=8D=E5=9D=87?= =?UTF-8?q?=E8=A1=A1=E5=88=86=E9=85=8D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StIvtStructattrServiceImpl.java | 12 ++++++++++++ .../src/views/wms/stor_manage/storIvtInfo/index.vue | 9 +++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java index d9cff5cc..683f4e85 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java @@ -20,6 +20,8 @@ import org.nl.common.utils.*; import org.nl.wms.decision_manage.handler.decisioner.impl.base.SameBlockNumRuleHandler; import org.nl.wms.dispatch_manage.task.handler.impl.MoveStorageTask; import org.nl.wms.dispatch_manage.task.handler.impl.OutStorageTask; +import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService; +import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; import org.nl.wms.flow_manage.flow.framework.process.nodeType.excess.impl.DecisionHandler; import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService; import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick; @@ -470,6 +472,16 @@ public class StIvtStructattrServiceImpl extends ServiceImpl query1 = new QueryWrapper() + .nested(qw -> qw.likeRight("point_code1", structCode.substring(0, structCode.lastIndexOf("-"))) + .or() + .likeRight("point_code2", structCode.substring(0, structCode.lastIndexOf("-")))) + .lt("status", StatusEnum.FORM_STATUS.code("完成")); + List schBaseTaskList = taskService.list(query1); + if (!CollectionUtils.isEmpty(schBaseTaskList)) { + throw new BadRequestException("当前同排同列库位在任务，请完成后再下发批量移库任务"); + } QueryWrapper query = new QueryWrapper() .eq("is_used", true) .likeRight("struct_code", structCode.substring(0, structCode.lastIndexOf("-"))) diff --git a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue index 43cd6bed..6be98c2e 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/index.vue @@ -156,7 +156,7 @@ { structattr.createMoveTask(this.crud.selections).then(res => { this.crud.notify('批量移库任务下发成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() - }) + })}) } } }