From a93fe1732d2d5389d6ddb14e34bc3c228e822cfd 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 11:47:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(transfer):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=BD=AC=E5=82=A8=E5=8D=95=E5=92=8C=E8=BD=AC=E5=8E=82=E5=8D=95?= =?UTF-8?q?=E6=97=A0=E6=89=AB=E6=8F=8F=E5=85=A5=E5=BA=93=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在TransferCompanyController中为getInfo方法添加单号参数以正确获取转储单信息 - 在TransferFactoryController中修正订单ID引用，使用order.getId()替代orderId参数 - 在TransferFactoryController中为getInfo方法添加单号参数以正确获取转厂单信息 - 解决因参数缺失导致的出库单信息获取失败问题 --- .../nflg/wms/admin/controller/TransferCompanyController.java | 2 +- .../nflg/wms/admin/controller/TransferFactoryController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 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 f34b7c7c..0bcabc00 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 @@ -991,7 +991,7 @@ public class TransferCompanyController extends BaseController { @Transactional @PostMapping("pda/submitForInNoScanning") public ApiResult submitForInNoScanning(@Valid @RequestBody NoScanningRequest request) { - TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(request.getId()); + TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(request.getId(),request.getNo()); VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在"); VUtil.trueThrowBusinessError(!Objects.equals(ticket.getState(), 0)).throwMessage("出库单无效"); 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 b8c60b8a..a35fe76e 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 @@ -530,7 +530,7 @@ public class TransferFactoryController extends BaseController { .one(); VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在"); List items = transferFactoryItemService.lambdaQuery() - .eq(WmsTransferFactoryItem::getOrderId, orderId) + .eq(WmsTransferFactoryItem::getOrderId, order.getId()) .list(); items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0 || noScanningBaseControllerService.cannotOutNoScanning(item.getMatnr(),order.getWerks(),order.getLgort())); @@ -964,7 +964,7 @@ public class TransferFactoryController extends BaseController { @Transactional @PostMapping("pda/submitForInNoScanning") public ApiResult submitForInNoScanning(@Valid @RequestBody @NotNull NoScanningRequest request) { - TransferFactoryTicketInfoVO ticket = transferFactoryTicketService.getInfo(request.getId()); + TransferFactoryTicketInfoVO ticket = transferFactoryTicketService.getInfo(request.getId(),request.getNo()); VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在"); VUtil.trueThrowBusinessError(!Objects.equals(ticket.getState(), 0)).throwMessage("出库单无效"); List ticketItems = transferFactoryTicketItemService.getList(ticket.getId()); From e5296c5f6e72874bd972c324e3c253e983a34c89 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 11:47:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor(wms):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9C=8D=E5=8A=A1=E4=B8=AD=E7=9A=84=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=90=8D=E8=AE=BE=E7=BD=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注释掉 WmsInventoryServiceImpl 中的 setUpdateBy 方法调用 - 注释掉创建和更新库存记录时的用户名设置代码 - 保持时间戳更新功能不变 - 简化用户信息处理流程 --- .../repository/service/impl/WmsInventoryServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java index 3533afcb..b9eb42b3 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java @@ -74,7 +74,7 @@ public class WmsInventoryServiceImpl extends ServiceImpl