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