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