From 383b5e004eaf4b7e5c133ae5f66536977e02421d Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Thu, 4 Jun 2026 08:47:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E9=97=B4/=E5=8E=82=E5=86=85=E8=B0=83?= =?UTF-8?q?=E6=8B=A8=E6=97=A0=E7=A0=81=E5=85=A5=E5=BA=93=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/controller/TransferCompanyController.java | 3 ++- .../wms/admin/controller/TransferFactoryController.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 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 0c5c6a43..5200c188 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 @@ -964,7 +964,8 @@ public class TransferCompanyController extends BaseController { @GetMapping("getListForNoScanIn") public ApiResult> getListForNoScanIn(@RequestParam(required = false) Long orderId , @RequestParam(required = false) String no) { - WmsTransferCompanyTicket ticket = getNoScanInTicket(orderId, no); + TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(orderId, no); + VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("订单不存在"); List items = transferCompanyTicketItemService.getList(ticket.getId()); items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0 || noScanningBaseControllerService.existsQrCode(item.getMatnr())); 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 1a6b37df..a64eb44d 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,7 +940,7 @@ public class TransferFactoryController extends BaseController { TransferFactoryTicketInfoVO order = transferFactoryTicketService.getInfo(orderId, no); VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在"); List items = transferFactoryTicketItemService.getList(order.getId()); - items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0 + items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0 || noScanningBaseControllerService.existsQrCode(item.getMatnr())); return ApiResult.success( items.stream() @@ -950,8 +950,8 @@ public class TransferFactoryController extends BaseController { .setMaterialNo(item.getMatnr()) .setMaterialDesc(item.getMaktx()) .setFactoryNo(order.getWerks()) - .setWarehouseNo(item.getUmlgo()) - .setNum(item.getLeft()) + .setWarehouseNo(order.getUmlgo()) + .setNum(item.getNum()) ) .toList() ); @@ -1003,7 +1003,7 @@ public class TransferFactoryController extends BaseController { .setBatchNo(batchNo) .setSerialNo(serialNo) .setFactoryNo(ticket.getWerks()) - .setWarehouseNo(ticketItem.getUmlgo()) + .setWarehouseNo(item.getWarehouseNo()) .setBinNo(binNo) .setUniqNo("NO_SCAN_" + IdUtil.getSnowflakeNextId()) .setRspos(ticketItem.getRspos())