From 9995ed8d020c2517a93812e9790775e64d793731 Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Sun, 30 Mar 2025 19:25:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/wms/controller/JobComponent.java | 4 ++-- .../com/wms/controller/TaskController.java | 12 +++++----- .../WorkServiceImplements.java | 22 +++++++++++++++---- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/wms/controller/JobComponent.java b/src/main/java/com/wms/controller/JobComponent.java index d411502..87ce0fc 100644 --- a/src/main/java/com/wms/controller/JobComponent.java +++ b/src/main/java/com/wms/controller/JobComponent.java @@ -179,10 +179,10 @@ public class JobComponent { // 轮询工作站台，判断是否需要下发任务 List stands = standService.list(new LambdaQueryWrapper() .eq(Stand::getIsLock, 0).eq(Stand::getStandStatus, 0) - .eq(Stand::getStandType, 2)); + .eq(Stand::getStandType, 2).orderByAsc(Stand::getStandId)); for (Stand workStation : stands) { try { -// // 创建工作 + // 创建工作 // workService.createWork(workStation.getStandId()); // 分配工作 workService.distributeWorks(workStation.getStandId()); diff --git a/src/main/java/com/wms/controller/TaskController.java b/src/main/java/com/wms/controller/TaskController.java index 3ea4d72..92f317d 100644 --- a/src/main/java/com/wms/controller/TaskController.java +++ b/src/main/java/com/wms/controller/TaskController.java @@ -1635,7 +1635,7 @@ public class TaskController { if (workFlowService.exists(new LambdaQueryWrapper() .eq(WorkFlow::getWorkStation, standId) .in(WorkFlow::getGoodsId, goodsIdList) - .ne(WorkFlow::getWorkStatus, 2))) { + .notIn(WorkFlow::getWorkStatus, -1, 2))) { // 需要，不放行，返回前台提示信息 StandPickVo pickVoEntity = new StandPickVo(); pickVoEntity.setTip("当前料箱还有其他物料需要拣货"); @@ -1659,7 +1659,7 @@ public class TaskController { // 判断是不是已经完成工作 if (workFlowService.exists(new LambdaQueryWrapper() .eq(WorkFlow::getWorkStation, standId) - .ne(WorkFlow::getWorkStatus, 2))) { + .notIn(WorkFlow::getWorkStatus, -1, 2))) { // 当前站台工作未全部完成 standService.update(new LambdaUpdateWrapper() .set(Stand::getLastUseTime, LocalDateTime.now()) @@ -1698,7 +1698,7 @@ public class TaskController { // 判断是不是已经完成工作 if (workFlowService.exists(new LambdaQueryWrapper() .eq(WorkFlow::getWorkStation, standId) - .ne(WorkFlow::getWorkStatus, 2))) { + .notIn(WorkFlow::getWorkStatus, -1, 2))) { // 当前站台工作未全部完成 standService.update(new LambdaUpdateWrapper() .set(Stand::getLastUseTime, LocalDateTime.now()) @@ -1815,7 +1815,7 @@ public class TaskController { if (workFlowService.exists(new LambdaQueryWrapper() .eq(WorkFlow::getWorkStation, targetStand.getStandId()) .in(WorkFlow::getGoodsId, goodsIdList) - .ne(WorkFlow::getWorkStatus, 2))) { + .notIn(WorkFlow::getWorkStatus, -1, 2))) { // 更新站台信息 standService.update(new LambdaUpdateWrapper() .set(Stand::getPickGoods, "") @@ -1837,7 +1837,7 @@ public class TaskController { // 判断是不是已经完成工作 if (workFlowService.exists(new LambdaQueryWrapper() .eq(WorkFlow::getWorkStation, targetStand.getStandId()) - .ne(WorkFlow::getWorkStatus, 2))) { + .notIn(WorkFlow::getWorkStatus, -1, 2))) { standService.update(new LambdaUpdateWrapper() .set(Stand::getLastUseTime, LocalDateTime.now()) .set(Stand::getPickVehicle, "") @@ -1873,7 +1873,7 @@ public class TaskController { // 判断是不是已经完成工作 if (workFlowService.exists(new LambdaQueryWrapper() .eq(WorkFlow::getWorkStation, targetStand.getStandId()) - .ne(WorkFlow::getWorkStatus, 2))) { + .notIn(WorkFlow::getWorkStatus, -1, 2))) { // 当前站台工作未全部完成 standService.update(new LambdaUpdateWrapper() .set(Stand::getLastUseTime, LocalDateTime.now()) diff --git a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java b/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java index 2769136..73ab441 100644 --- a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java +++ b/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java @@ -267,7 +267,6 @@ public class WorkServiceImplements implements IWorkService { List currentWorkFlowList = workFlowService.list(new LambdaQueryWrapper() .eq(WorkFlow::getWorkStation, workStation) .notIn(WorkFlow::getWorkStatus, -1, 2)); -// .ne(WorkFlow::getWorkStatus, 2)); // 没有可做的任务 if (currentWorkFlowList == null || currentWorkFlowList.isEmpty()) { return; @@ -459,8 +458,7 @@ public class WorkServiceImplements implements IWorkService { try { if (workFlowService.exists(new LambdaQueryWrapper() .eq(WorkFlow::getWorkStation, workStation) - .notIn(WorkFlow::getWorkStatus, -1, 2) - .ne(WorkFlow::getWorkStatus, 2))) { + .notIn(WorkFlow::getWorkStatus, -1, 2))) { // 当前站台工作未全部完成 return "工作未全部做完，不允许确认完成。"; } @@ -817,6 +815,14 @@ public class WorkServiceImplements implements IWorkService { // 仍有未生成的平地机任务，跳过 return; } + List doingMgWorkFlows = workFlowService.list(new LambdaQueryWrapper() + .eq(WorkFlow::getWorkStation, workStation) + .eq(WorkFlow::getMachineType, 2) + .ne(WorkFlow::getWorkStatus, -1)); + if (!doingMgWorkFlows.isEmpty()) { + // 当前站台平地机正在做 + return; + } // 查询装载机 List mwlWorks = workFlowService.list(new LambdaQueryWrapper() .eq(WorkFlow::getMachineType, 1) @@ -851,6 +857,14 @@ public class WorkServiceImplements implements IWorkService { // 仍有未生成的装载机任务，跳过 return; } + List doingMwlWorkFlows = workFlowService.list(new LambdaQueryWrapper() + .eq(WorkFlow::getWorkStation, workStation) + .eq(WorkFlow::getMachineType, 1) + .ne(WorkFlow::getWorkStatus, -1)); + if (!doingMwlWorkFlows.isEmpty()) { + // 当前站台装载机正在做 + return; + } // 查询平地机 List mgWorks = workFlowService.list(new LambdaQueryWrapper() .eq(WorkFlow::getMachineType, 2) @@ -1055,7 +1069,7 @@ public class WorkServiceImplements implements IWorkService { } // 查找当前站台未开始的工作流 List currentWorkFlowList = workFlowService.list(new LambdaQueryWrapper() - .ne(WorkFlow::getWorkStatus, 2) + .notIn(WorkFlow::getWorkStatus, -1, 2) .in(WorkFlow::getWorkStation, standIds)); // 没有可做的任务 if (currentWorkFlowList == null || currentWorkFlowList.isEmpty()) {