From 54d3bcd2f07128cb57f69ba3f5e9fa4d25f2d3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 30 May 2026 10:42:35 +0800 Subject: [PATCH] =?UTF-8?q?fix(order):=20=E4=BC=98=E5=8C=96=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E6=89=98=E7=9B=98=E7=8A=B6=E6=80=81=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在查询托盘编号时增加状态筛选，仅获取运输中的托盘 - 移除冗余的待收货托盘存在性校验，改为直接判断托盘列表是否为空 - 校验请求中的托盘编号集合是否与实际托盘集合匹配，确保托盘齐套 - 更新托盘状态时，设置为已收货并记录接收人信息 --- .../admin/controller/StructuralPackageOrderController.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index a07a9869..9a5b7992 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -1164,17 +1164,14 @@ public class StructuralPackageOrderController extends BaseController { List trayNos = structuralPackageOrderTrayService.lambdaQuery() .select(WmsStructuralPackageOrderTray::getNo) .eq(WmsStructuralPackageOrderTray::getOrderId, request.getId()) + .eq(WmsStructuralPackageOrderTray::getState, OrderState.InTransit.getState()) .list() .stream() .map(WmsStructuralPackageOrderTray::getNo) .toList(); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(trayNos)).throwMessage("没有需要收货的数据"); VUtil.trueThrowBusinessError(!new HashSet<>(trayNos).equals(new HashSet<>(request.getTrayNos()))) .throwMessage("托盘未齐套"); - VUtil.trueThrowBusinessError(!structuralPackageOrderTrayService.lambdaQuery() - .eq(WmsStructuralPackageOrderTray::getOrderId, request.getId()) - .eq(WmsStructuralPackageOrderTray::getState, OrderState.InTransit.getState()) - .exists()) - .throwMessage("没有需要收货的数据"); structuralPackageOrderTrayService.lambdaUpdate() .set(WmsStructuralPackageOrderTray::getState, OrderState.Received.getState()) .set(WmsStructuralPackageOrderTray::getReceiveBy, UserUtil.getUserName())