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());