From f5a6fe6e939e09fdaa9443271235ea870d6102af Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Thu, 25 Jul 2024 11:27:36 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/handler/impl/GroupDickInStorageTask.java | 2 +- wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java index 3a14f867..a16b8972 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java @@ -63,7 +63,7 @@ public class GroupDickInStorageTask extends AbstractTask { } MdGruopDick mst = iMdGruopDickService .getOne(new QueryWrapper().eq("vehicle_code", vehicle_code) - .lt("status", StatusEnum.FORM_STATUS.code("完成"))); + .le("status", StatusEnum.FORM_STATUS.code("完成"))); if (mst == null){ throw new BadRequestException("申请任务失败:载具"+vehicle_code+"组盘信息不存在"); } diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue index 6811229f..94fc1c75 100644 --- a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue +++ b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue @@ -191,7 +191,7 @@ type="text" icon="el-icon-error" @click="doOperate(scope.row, 'b')" - :disabled="scope.row.status==='80' || scope.row.status==='82' || scope.row.status==='82'" + :disabled="scope.row.status==='80' || scope.row.status==='82' || scope.row.status==='90'" >取消