From 7635b5100cd8cdab5fc26f561a78ca0e8a8b9154 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Sun, 18 Aug 2024 13:03:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=84=E7=9B=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8Cfix:=E5=BC=82=E5=B8=B8=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/handler/impl/GroupDickInStorageTask.java | 2 +- .../task/service/impl/SchBaseTaskServiceImpl.java | 3 ++- .../org/nl/wms/stor_manage/pick/service/PickingService.java | 2 +- 3 files changed, 4 insertions(+), 3 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 51622de9..a9f630b9 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) - .le("status", StatusEnum.FORM_STATUS.code("完成"))); + .lt("status", StatusEnum.FORM_STATUS.code("完成"))); if (mst == null){ throw new BadRequestException("申请任务失败:载具"+vehicle_code+"组盘信息不存在"); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java index bd4896ef..45ad46d0 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java @@ -257,7 +257,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl() - .eq("vehicle_code", task.getVehicle_code())); + .eq("vehicle_code", task.getVehicle_code()) + .eq("is_delete",false)); //查询分配规则 Map map = SpringContextHolder.getBean(DecisionHandler.class) .dispenseTransa(ListOf.of("nearby"), new JSONObject(MapOf.of("stor_code", stIvtStructattr.getStor_code()))); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java index 5ec9a590..0be0a18a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java @@ -221,7 +221,7 @@ public class PickingService { dick.setSource_form_id(data.getId()); dick.setCreate_name(SecurityUtils.getCurrentNickName()); dick.setCreate_time(DateUtil.now()); - dick.setStatus(StatusEnum.FORM_STATUS.code("完成")); + dick.setStatus(StatusEnum.FORM_STATUS.code("执行中")); dick.setCode(CodeUtil.getNewCode("md_group_dick")); dick.setId(IdUtil.getStringId()); MdPbVehicleMater mater = new MdPbVehicleMater();