From 40f8914bd571ca6d0d1c92fd113f9f339a5a2e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 4 Jun 2026 14:21:55 +0800 Subject: [PATCH] =?UTF-8?q?fix(transfer):=20=E8=A7=A3=E5=86=B3=E5=B7=B2?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=AE=A2=E5=8D=95=E4=BB=8D=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E9=A1=B9=E7=9B=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 TransferCompanyController 中添加订单完成状态检查 - 在 TransferFactoryController 中添加订单完成状态检查 - 完成订单直接返回空列表避免继续处理 - 移除冗余的数量零值判断逻辑 - 优化二维码扫描状态过滤条件 --- .../wms/admin/controller/TransferCompanyController.java | 6 ++++-- .../wms/admin/controller/TransferFactoryController.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index 0bcabc00..fa6b6c0b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -967,9 +967,11 @@ public class TransferCompanyController extends BaseController { , @RequestParam(required = false) String no) { TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(orderId, no); VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("订单不存在"); + if (ticket.getFinish()){ + return ApiResult.success(Collections.emptyList()); + } List items = transferCompanyTicketItemService.getList(ticket.getId()); - items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0 - || noScanningBaseControllerService.existsQrCode(item.getMatnr())); + items.removeIf(item -> noScanningBaseControllerService.existsQrCode(item.getMatnr())); return ApiResult.success( items.stream() .map(item -> new NoScanItemVO() diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index a35fe76e..9f8747a6 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -940,9 +940,11 @@ public class TransferFactoryController extends BaseController { , @RequestParam(required = false) String no) { TransferFactoryTicketInfoVO order = transferFactoryTicketService.getInfo(orderId, no); VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在"); + if (order.getFinish()){ + return ApiResult.success(Collections.emptyList()); + } List items = transferFactoryTicketItemService.getList(order.getId()); - items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0 - || noScanningBaseControllerService.existsQrCode(item.getMatnr())); + items.removeIf(item -> noScanningBaseControllerService.existsQrCode(item.getMatnr())); return ApiResult.success( items.stream() .map(item -> new NoScanItemVO()