diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 91aaddb0..78911ac0 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -193,6 +193,8 @@ public class NormalPGIController extends BaseController { */ @GetMapping("getListForNoScan") public ApiResult> getListForNoScan(@RequestParam Long orderId) { + WmsSrmOrder order = wmsSrmOrderService.getById(orderId); + VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("收货单不存在"); List items = wmsSrmOrderItemService.lambdaQuery() .eq(WmsSrmOrderItem::getOrderId, orderId) .list(); @@ -200,13 +202,18 @@ public class NormalPGIController extends BaseController { || noScanningBaseControllerService.existsQrCode(item.getItemCode())); return ApiResult.success( items.stream() - .map(item -> new NoScanItemVO() - .setRowNo(item.getLineNumber()) - .setOrderItemId(item.getId()) - .setMaterialNo(item.getItemCode()) - .setMaterialDesc(item.getItemName()) - .setWarehouseNo("") - .setNum(item.getDeliveryQty().subtract(item.getReceiptQty()))) + .map(item -> { + SAPSyncParamsDTO syncParamsDTO = sapCommonService.getMaterialInfoInOrder(item.getPoNum(), + order.getSupplierNum(), item.getItemCode(), item.getPoLineNumber()); + return new NoScanItemVO() + .setRowNo(item.getLineNumber()) + .setOrderItemId(item.getId()) + .setMaterialNo(item.getItemCode()) + .setMaterialDesc(item.getItemName()) + .setFactoryNo(order.getIuCode()) + .setWarehouseNo(syncParamsDTO.getWarehouseNo()) + .setNum(item.getDeliveryQty().subtract(item.getReceiptQty())); + }) .toList() ); }