From 4b1f8be0a3e56345f0165f4660b40d6ee3083b7a Mon Sep 17 00:00:00 2001 From: lsymicc Date: Thu, 14 May 2026 13:56:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=A7=E5=88=B6=E5=8F=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/job/service/impl/MydoJobServiceImpl.java | 2 -- .../com/ruoyi/schedule/scheduleTask/TaskHandler.java | 11 +++++++++-- .../ruoyi/schedule/scheduleTask/ddj/DdjThread.java | 4 +++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java index 06df88c..b9cc228 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java @@ -109,8 +109,6 @@ public class MydoJobServiceImpl implements IMydoJobService } } - - } return mydoJobMapper.deleteMydoJobByJobIds(jobIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/TaskHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/TaskHandler.java index 3315a85..89b9b48 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/TaskHandler.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/TaskHandler.java @@ -115,6 +115,7 @@ public class TaskHandler { new MydoJob().builder().executionPhase(TASK_EXCEPTION_PUT).build() ); + String oldCargo = jobs.get(0).getCargoSpaceId(); if (!jobs.isEmpty()) { for (MydoJob job : jobs) { //上报异常 - 向wms请求重分接口 @@ -122,7 +123,7 @@ public class TaskHandler { taskExceptionRequest.setTaskClass(job.getInOrOut().substring(0, 1)); taskExceptionRequest.setType(String.valueOf(TASK_EXCEPTION_STOCKIN_OCCUPIED)); taskExceptionRequest.setTaskCode(job.getWmsTaskNo()); - taskExceptionRequest.setTaskTypeCode(WMS_TASK_TYPE_EXCEPTION);//todo 不知道填什么 + taskExceptionRequest.setTaskTypeCode(WMS_TASK_TYPE_EXCEPTION);//wms自定义文本 taskExceptionRequest.setReqCode(UUID.randomUUID().toString().replace("-", "")); taskExceptionRequest.setAdverseCauses("当前位置已有货物，盘点后重新分配货位"); @@ -144,7 +145,9 @@ public class TaskHandler { job.setExecutionPhase(TASK_EXCEPTION_PUT_REASSIGN); job.setFaultFlag("2"); mydoJobService.updateMydoJob(job); - + log.info("【入库异常】请求wms重分货位成功，异常货位:{}，新货位:{}，任务号:{}", oldCargo, mydoJobReAssign.getSiteCode(), job.getTaskNo()); + }else{ + log.info("【入库异常】请求wms重分货位异常，异常上报请求失败，请咨询操作管理员，异常货位:{}，当前任务号:{}", oldCargo, job.getTaskNo()); } } } @@ -180,6 +183,10 @@ public class TaskHandler { mydoJobService.InvalidMydoJob(Long.valueOf(job.getTaskNo()), Integer.valueOf(job.getRoadwayId())); //清空/重置【取货无货】的出库异常货位库存信息 basCargoSpaceService.resetCargoSpaceByStockoutException(job.getCargoSpaceId()); + + log.info("【出库异常】堆垛机取货时目标位置无货，当前任务已作废，异常货位:{}，任务号:{}", job.getCargoSpaceId(), job.getRoadwayId()); + }else{ + log.info("【出库异常】堆垛机取货时目标位置无货，异常上报请求失败，请咨询操作管理员，异常货位:{}，任务号:{}", job.getCargoSpaceId(), job.getRoadwayId()); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java index 7bdaaa0..70d6e9a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread.java @@ -167,6 +167,7 @@ public class DdjThread implements Runnable { //把执行阶段标记为【入库放货有货】的异常 mydoJob.setExecutionPhase(TASK_EXCEPTION_PUT); mydoJobService.updateMydoJob(mydoJob); + log.info("【入库异常】堆垛机放货时目标位置有货，异常货位:{}，任务号:{}", mydoJob.getCargoSpaceId(), rwh); } // //上报异常 - 向wms请求重分接口 @@ -227,6 +228,7 @@ public class DdjThread implements Runnable { //把执行阶段标记为【出库取货无货】的异常 mydoJob.setExecutionPhase(TASK_EXCEPTION_PICK); mydoJobService.updateMydoJob(mydoJob); + log.info("【出库异常】堆垛机取货时目标位置无货，异常货位:{}，任务号:{}", mydoJob.getCargoSpaceId(), rwh); } @@ -281,7 +283,7 @@ public class DdjThread implements Runnable { ddjDeviceExecutionQueueService.updateDdjDeviceExecutionQueue(ddjDeviceExecutionQueue); mydoJob.setFaultFlag("0"); mydoJobService.updateMydoJob(mydoJob); - log.info("【入库异常】堆垛机放货目标有货，重分货位下发堆垛机任务成功 rwh:{}", rwh); + log.info("【入库异常】重分货位下发堆垛机任务成功，当前任务号:{}", rwh); } else { log.error("【入库异常】重分货位 - 下发堆垛机任务失败！！！！！！！"); }