From b80ed591c9b36116834f7bdf866386eeb278b9c0 Mon Sep 17 00:00:00 2001 From: "bo.wu@finesys.com.cn" Date: Fri, 18 Jul 2025 13:12:51 +0800 Subject: [PATCH] =?UTF-8?q?wcs=E6=8A=A5=E9=87=8D=E5=A4=8D=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=90=8E=EF=BC=8Cwms=E6=9B=B4=E6=94=B9=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81=E4=B8=BA=E5=B7=B2=E5=8F=91=E7=94=9F?= =?UTF-8?q?=202.=20=E5=B7=A5=E7=AB=99=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=AF=E6=9B=B4=E6=96=B0=E5=A4=9A=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KateWorkQueryController.java | 6 +++ .../WmsJobServiceImplements.java | 51 ++++++++++++++----- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/wms/controller/KateWorkQueryController.java b/src/main/java/com/wms/controller/KateWorkQueryController.java index c3bdcf3..e5f564e 100644 --- a/src/main/java/com/wms/controller/KateWorkQueryController.java +++ b/src/main/java/com/wms/controller/KateWorkQueryController.java @@ -402,6 +402,12 @@ public class KateWorkQueryController { .set(stationConfigQuery.getOrderQuantity() != null && stationConfigQuery.getOrderQuantity() > 0, WorkStationConfig::getOrderQuantity, stationConfigQuery.getOrderQuantity()) .set(StringUtils.isNotEmpty(stationConfigQuery.getWorkStation()), WorkStationConfig::getWorkStation, stationConfigQuery.getWorkStation()) .set(stationConfigQuery.getStartDateAdjust() != null, WorkStationConfig::getStartDateAdjust, stationConfigQuery.getStartDateAdjust()) + .set(StringUtils.isNotEmpty(stationConfigQuery.getBigBox()), WorkStationConfig::getBigBox, stationConfigQuery.getBigBox()) + .set(StringUtils.isNotEmpty(stationConfigQuery.getModel()), WorkStationConfig::getModel, stationConfigQuery.getModel()) + .set(StringUtils.isNotEmpty(stationConfigQuery.getSmallBox()), WorkStationConfig::getSmallBox, stationConfigQuery.getSmallBox()) + .set(StringUtils.isNotEmpty(stationConfigQuery.getVehicle()), WorkStationConfig::getVehicle, stationConfigQuery.getVehicle()) + .set(StringUtils.isNotEmpty(stationConfigQuery.getVehicleLocation()), WorkStationConfig::getVehicleLocation, stationConfigQuery.getVehicleLocation()) + .set(StringUtils.isNotEmpty(stationConfigQuery.getWorkCenter()), WorkStationConfig::getWorkCenter, stationConfigQuery.getWorkCenter()) .eq(WorkStationConfig::getConfigId, stationConfigQuery.getConfigId())); if (updateResult) { logger.info("更新更新工站配置成功。"); diff --git a/src/main/java/com/wms/service/business/serviceImplements/WmsJobServiceImplements.java b/src/main/java/com/wms/service/business/serviceImplements/WmsJobServiceImplements.java index 0f7818f..966cf7c 100644 --- a/src/main/java/com/wms/service/business/serviceImplements/WmsJobServiceImplements.java +++ b/src/main/java/com/wms/service/business/serviceImplements/WmsJobServiceImplements.java @@ -1035,21 +1035,48 @@ public class WmsJobServiceImplements implements IWmsJobService { } standStackerTaskBakService.saveBatch(needSaveRecords); } else { - // 判断returnData的数据 - if (result.getReturnData() != null) { - List errorTasks = JSON.parseArray(result.getReturnData().toString(), WcsTaskRequest.class); - if (!errorTasks.isEmpty()) { - List failedTaskIds = errorTasks.stream().map(WcsTaskRequest::getTaskId).distinct().toList(); - // 更新任务状态为异常 - taskService.update(new LambdaUpdateWrapper() - .set(Task::getTaskStatus, WmsTaskStatus.EXCEPTION.getCode()) - .in(Task::getTaskGroup, failedTaskIds) - .eq(Task::getTaskStatus, WmsTaskStatus.NEW.getCode())); +// String msg = result.getMessage(); +// if(StringUtils.isNotEmpty(msg)){ +// //查看错误信息是否包含特定字符串”请勿重复“ +// //任务:2825070213024217917514325621790001 已存在,请勿重复” +// if (msg.contains("请勿重复")) { +// 截取字符串从冒号":"至空格的字符串 +// String taskGroup = msg.substring(msg.indexOf(":") + 1, msg.indexOf(" ")); +// // 更新任务状态为1 +// taskService.update(new LambdaUpdateWrapper() +// .set(Task::getTaskStatus, WmsTaskStatus.WAIT.getCode()) +// .eq(Task::getTaskGroup, taskGroup) +// .eq(Task::getTaskStatus, WmsTaskStatus.NEW.getCode())); +// logger.info("发送拣选出库任务错误，已处理改为已发送：{}", convertJsonString(result)); +// return; +// } +// } + // 判断returnData的数据 + if (result.getReturnData() != null) { + List errorTasks = JSON.parseArray(result.getReturnData().toString(), WcsTaskRequest.class); + if (!errorTasks.isEmpty()) { + List failedTaskIds = errorTasks.stream().map(WcsTaskRequest::getTaskId).distinct().toList(); + if(Objects.equals(ResponseCode.WARNING.getCode(), result.getCode())){ + taskService.update(new LambdaUpdateWrapper() + .set(Task::getTaskStatus, WmsTaskStatus.WAIT.getCode()) + .in(Task::getTaskGroup, failedTaskIds) + .eq(Task::getTaskStatus, WmsTaskStatus.NEW.getCode())); + logger.info("发送拣选出库任务错误，已处理改为已发送：{}", convertJsonString(result)); + return; + }else { + // 更新任务状态为异常 + taskService.update(new LambdaUpdateWrapper() + .set(Task::getTaskStatus, WmsTaskStatus.EXCEPTION.getCode()) + .in(Task::getTaskGroup, failedTaskIds) + .eq(Task::getTaskStatus, WmsTaskStatus.NEW.getCode())); + } + + } } + logger.error("发送拣选出库任务错误，{}", convertJsonString(result)); } - logger.error("发送拣选出库任务错误：{}", convertJsonString(result)); + } - } } else { logger.error("WCS发送任务地址为空。"); }