From 45be4cb4287feafa63c2023b97e220737116a6e7 Mon Sep 17 00:00:00 2001 From: FT577 Date: Mon, 21 Sep 2026 11:01:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E8=BF=90=E8=A1=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/impl/ApiServiceImpl.java | 4 ++-- .../schedule/scheduleTask/TaskHandler.java | 20 ++++++++++++------- .../scheduleTask/ddj/DdjThread_2.java | 4 ++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java index e37db68..2c8a067 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java @@ -94,7 +94,7 @@ public class ApiServiceImpl implements IApiService { MydoJob mydoJob = mydoJobService.selectMydoJobByJobId(wmsMydoJob.getJobId()); mydoJob.setCargoSpaceId(wmsMydoJob.getCargoSpaceId()); mydoJobService.updateMydoJob(mydoJob); - return AjaxResult.success(); + return AjaxResult.success(jobParam); } return AjaxResult.error(); } @@ -109,7 +109,7 @@ public class ApiServiceImpl implements IApiService { public AjaxResult reMaterial(JobParam jobParam) { RequestLog requestLog = requestLogService.getRequestLog(WMS_RE_MATERIAL_URL, "重新分配物料", JSONUtil.toJsonStr(jobParam)); if ("1".equals(requestLog.getIsSuccessful())){ - return AjaxResult.success(); + return AjaxResult.success(jobParam); } return AjaxResult.error(); } 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 e9f5420..d34b084 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 @@ -183,7 +183,8 @@ public class TaskHandler { AjaxResult ajaxResult = apiService.reMaterial(param); if (ajaxResult.isSuccess()){ - mydoJobService.InvalidMydoJob(Long.valueOf(job.getTaskNo()), Integer.valueOf(job.getRoadwayId())); +// mydoJobService.InvalidMydoJob(Long.valueOf(job.getTaskNo()), Integer.valueOf(job.getRoadwayId())); + mydoJobService.cancelTask(job.getJobId()); //清空/重置【取货无货】的出库异常货位库存信息 basCargoSpaceService.resetCargoSpaceByStockoutException(job.getCargoSpaceId()); @@ -229,22 +230,27 @@ public class TaskHandler { AjaxResult ajaxResult = apiService.reAssign(param); if (ajaxResult.isSuccess()){ //获取返回的任务号和新分配的货位 - TaskExceptionReceive mydoJobReAssign = BeanUtil.toBean(ajaxResult.get("data"), TaskExceptionReceive.class); + JobParam jobParam = BeanUtil.toBean(ajaxResult.get("data"), JobParam.class); + + if (ObjUtil.isNull(jobParam)){ + log.warn("【响应异常】入库重分请求异常，无响应数据，任务号:{}", jobParam.getTaskNo()); + return; + } MydoJob wmsJob = new MydoJob(); - wmsJob.setWmsTaskNo(mydoJobReAssign.getTaskCode()); - if (mydoJobService.selectMydoJobList(wmsJob).size() == 0) { - log.warn("【响应异常】该任务不存在，任务号:{}", mydoJobReAssign.getTaskCode()); + wmsJob.setTaskNo(jobParam.getTaskNo()); + if (ObjUtil.isNull(wmsJob)) { + log.warn("【响应异常】该任务不存在，任务号:{}", jobParam.getTaskNo()); return; } //更新任务参数 job = mydoJobService.selectMydoJobByTaskNo(Long.valueOf(job.getTaskNo())); - job.setCargoSpaceId(mydoJobReAssign.getSiteCode()); + job.setCargoSpaceId(jobParam.getCargoSpaceId()); job.setExecutionPhase(TASK_EXCEPTION_PUT_REASSIGN); job.setFaultFlag("2"); mydoJobService.updateMydoJob(job); - log.info("【入库异常】请求wms重分货位成功，异常货位:{}，新货位:{}，任务号:{}", oldCargo, mydoJobReAssign.getSiteCode(), job.getTaskNo()); + log.info("【入库异常】请求wms重分货位成功，异常货位:{}，新货位:{}，任务号:{}", oldCargo, jobParam.getCargoSpaceId(), job.getTaskNo()); }else{ log.info("【入库异常】请求wms重分货位异常，异常上报请求失败，请咨询操作管理员，异常货位:{}，当前任务号:{}", oldCargo, job.getTaskNo()); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread_2.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread_2.java index 69492b6..b0a582a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread_2.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/DdjThread_2.java @@ -157,9 +157,9 @@ public class DdjThread_2 implements Runnable { MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(rwh); if (mydoJob != null && mydoJob.getExecutionPhase() != TASK_EXCEPTION_PUT) { - DdjDeviceExecutionQueue ddjDeviceExecutionQueue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByRwh(rwh, ddj.getId()); +// DdjDeviceExecutionQueue ddjDeviceExecutionQueue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByRwh(rwh, ddj.getId()); //更新异常类型【FaultFlag】-1 - if ("0".equals(mydoJob.getFaultFlag()) && "1".equals(ddjDeviceExecutionQueue.getSpare1())) { + if ("0".equals(mydoJob.getFaultFlag())) { mydoJob.setStatus("1"); //把执行阶段标记为【入库放货有货】的异常 mydoJob.setExecutionPhase(TASK_EXCEPTION_PUT);