From 1548a28c9eda27e4be148b9d59038185e298f3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 11 Jul 2026 10:32:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BB=BB=E5=8A=A1=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=A9=BA=E6=8C=87=E9=92=88=E5=A4=84=E7=90=86;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 21 ++++++++++++------- .../StockOutOrderApplicationService.java | 21 ++++++++++++------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 80cb8c795..6a3a299db 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -604,17 +604,22 @@ public class StockInOrderApplicationService { } String[] split = taskIssueUserId.split(","); List taskIds = Arrays.asList(split); - // 删除匹配元素 - taskIds.removeIf(str -> removeUserId.equals(str)); if (taskIds != null && taskIds.size() > 0) { - String newTaskIssueUserId = String.join(",", taskIds); - stock.setTaskIssueUserId(newTaskIssueUserId); - stockInOrderService.updateById(stock); + // 删除匹配元素 + taskIds.removeIf(str -> removeUserId.equals(str)); + if (taskIds != null && taskIds.size() > 0) { + String newTaskIssueUserId = String.join(",", taskIds); + stock.setTaskIssueUserId(newTaskIssueUserId); + stockInOrderService.updateById(stock); + } else { + stockInOrderService.update(null ,new LambdaUpdateWrapper() + .set(StockInOrder::getTaskIssueUserId, null) + .eq(StockInOrder::getInOrderId, stockInOrder.getInOrderId())); + } } else { - stockInOrderService.update(null ,new LambdaUpdateWrapper() - .set(StockInOrder::getTaskIssueUserId, null) - .eq(StockInOrder::getInOrderId, stockInOrder.getInOrderId())); + throw new ServiceException("当前订单没有任务人员!"); } + } public void omsOrderAddDetail(List inMaterialDetails){ diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index dd5583a13..a8ecf9aa8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -1651,17 +1651,22 @@ public class StockOutOrderApplicationService { } String[] split = taskIssueUserId.split(","); List taskIds = Arrays.asList(split); - // 删除匹配元素 - taskIds.removeIf(str -> removeUserId.equals(str)); if (taskIds != null && taskIds.size() > 0) { - String newTaskIssueUserId = String.join(",", taskIds); - stock.setTaskIssueUserId(newTaskIssueUserId); - stockOutOrderService.updateById(stock); + // 删除匹配元素 + taskIds.removeIf(str -> removeUserId.equals(str)); + if (taskIds != null && taskIds.size() > 0) { + String newTaskIssueUserId = String.join(",", taskIds); + stock.setTaskIssueUserId(newTaskIssueUserId); + stockOutOrderService.updateById(stock); + } else { + stockOutOrderService.update(null ,new LambdaUpdateWrapper() + .set(StockOutOrder::getTaskIssueUserId, null) + .eq(StockOutOrder::getOutOrderId, stockOutOrder.getOutOrderId())); + } } else { - stockOutOrderService.update(null ,new LambdaUpdateWrapper() - .set(StockOutOrder::getTaskIssueUserId, null) - .eq(StockOutOrder::getOutOrderId, stockOutOrder.getOutOrderId())); + throw new ServiceException("当前订单不存在任务人员!"); } + }