From 947b5746de28b3c844213c334008e0b2ab73da9e Mon Sep 17 00:00:00 2001 From: liang <594755172@qq.com> Date: Sat, 29 Mar 2025 12:12:12 +0800 Subject: [PATCH] =?UTF-8?q?1.=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KateWorkControllerServiceImpl.java | 13 ++++++------- .../serviceImpl/TaskControllerServiceImpl.java | 15 +++++++-------- .../serviceImpl/OutsExecutorServiceImpl.java | 12 +++++++++--- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/KateWorkControllerServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/KateWorkControllerServiceImpl.java index 466a22f..e22057c 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/KateWorkControllerServiceImpl.java +++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/KateWorkControllerServiceImpl.java @@ -394,13 +394,12 @@ public class KateWorkControllerServiceImpl implements IKateWorkControllerService } // 当前站台到达的拣选任务 TAppPickTask thisPickTask = pickTaskList.getFirst(); - if (confirmWorkRequest.getStockConfirm() == null || confirmWorkRequest.getOrderConfirm() == null) { - return BaseWmsApiResponse.error("确认信息不全。"); - } - // 更新工作信息 - String updateWorkResult = updateWorkInfo(confirmWorkRequest); - if (StringUtils.isNotEmpty(updateWorkResult)) { - return BaseWmsApiResponse.error("更新工作信息失败：" + updateWorkResult + "，请重试。"); + if (confirmWorkRequest.getOrderConfirm() != null) { + // 更新工作信息 + String updateWorkResult = updateWorkInfo(confirmWorkRequest); + if (StringUtils.isNotEmpty(updateWorkResult)) { + return BaseWmsApiResponse.error("更新工作信息失败：" + updateWorkResult + "，请重试。"); + } } // 更新库存信息 stockDataService.updateStockInfo(confirmWorkRequest.getStockConfirm(), confirmWorkRequest.getStandId(), confirmWorkRequest.getUserName(), "配料拣选"); diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskControllerServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskControllerServiceImpl.java index 2e38d37..8c40468 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskControllerServiceImpl.java +++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskControllerServiceImpl.java @@ -681,13 +681,12 @@ public class TaskControllerServiceImpl implements ITaskControllerService { } // 当前站台到达的拣选任务 TAppPickTask thisPickTask = pickTaskList.getFirst(); - if (confirmTaskRequest.getTaskConfirm() == null || confirmTaskRequest.getStockConfirm() == null) { - return BaseWmsApiResponse.error("确认信息不全。"); - } - // 更新工作信息 - String updateTaskResult = updateTaskInfo(confirmTaskRequest); - if (StringUtils.isNotEmpty(updateTaskResult)) { - return BaseWmsApiResponse.error("更新任务信息失败：" + updateTaskResult + "，请重试。"); + if (confirmTaskRequest.getTaskConfirm() != null) { + // 更新工作信息 + String updateTaskResult = updateTaskInfo(confirmTaskRequest); + if (StringUtils.isNotEmpty(updateTaskResult)) { + return BaseWmsApiResponse.error("更新任务信息失败：" + updateTaskResult + "，请重试。"); + } } // 更新库存信息 stockDataService.updateStockInfo(confirmTaskRequest.getStockConfirm(), confirmTaskRequest.getStandId(), confirmTaskRequest.getUserName(), "出库拣选"); @@ -741,7 +740,7 @@ public class TaskControllerServiceImpl implements ITaskControllerService { } outs.setPickNum(outs.getPickNum() + taskConfirm.getRealPickQty()); outs.setUserName(confirmTaskRequest.getUserName()); - if (Objects.equals(outs.getPickNum(), outs.getNeedNum())) { + if (outs.getPickNum() >= outs.getNeedNum()) { // 生成记录 TAppOutsRecord record = new TAppOutsRecord( outs.getTaskId(), diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/serviceImpl/OutsExecutorServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/serviceImpl/OutsExecutorServiceImpl.java index 0dfa022..30ac1d2 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/serviceImpl/OutsExecutorServiceImpl.java +++ b/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/serviceImpl/OutsExecutorServiceImpl.java @@ -760,7 +760,9 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService { return result && stock.getGoodsId().equals(work.getGoodsId()); }).toList(); if (outStocks.isEmpty()) { - work.setWorkStatus(1); + if (work.getWorkStatus() == 2) { + work.setWorkStatus(1); + } work.setDistributeNum(work.getFinishNum()); ifAllFinished = false; continue; @@ -770,7 +772,9 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService { List pickTasks = allPickTasks.stream().filter(pickTask -> vehicleIds.contains(pickTask.getVehicleId()) && Objects.equals(pickTask.getPickStand(), work.getWorkStand())).toList(); if (pickTasks.isEmpty()) { - work.setWorkStatus(1); + if (work.getWorkStatus() == 2) { + work.setWorkStatus(1); + } work.setDistributeNum(work.getFinishNum()); ifAllFinished = false; continue; @@ -803,7 +807,9 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService { updateWork.setWorkIndex(work.getWorkIndex()); updateWork.setWorkStatus(work.getWorkStatus()); updateWork.setLackStatus(work.getLackStatus()); - updateWork.setDistributeNum(work.getDistributeNum()); + if (work.getWorkStatus() == 1) { + updateWork.setDistributeNum(work.getDistributeNum()); + } if (work.getFinishTime() != null) { updateWork.setFinishTime(work.getFinishTime()); }