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 a32f3eaa..7a3da1d4 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 @@ -965,7 +965,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())); @@ -977,7 +978,7 @@ public class TransferCompanyController extends BaseController { .setMaterialNo(item.getMatnr()) .setMaterialDesc(item.getMaktx()) .setFactoryNo(item.getWerks()) - .setWarehouseNo(item.getLgpbe1()) + .setWarehouseNo(ticket.getLgort()) .setNum(item.getNum()) ) .toList() 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 736f5fb2..b8c60b8a 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 @@ -941,7 +941,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() @@ -951,8 +951,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() ); @@ -1004,7 +1004,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())