From 29b5881f39d86e6a768aaac8553154226b96f1e8 Mon Sep 17 00:00:00 2001 From: 10002617 Date: Thu, 18 Jun 2026 11:36:11 +0800 Subject: [PATCH] =?UTF-8?q?1574=20=E3=80=90=E9=92=A2=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E3=80=91=E5=92=8C=E3=80=90=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F-=E9=92=A2=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E3=80=91=E7=9A=84=E9=9B=B6=E4=BB=B6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E3=80=90=E5=9B=BE=E5=8F=B7?= =?UTF-8?q?=E3=80=91=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StructuralPackageOrderController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index c3b16cb7..60cae812 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -13,6 +13,7 @@ import com.alibaba.excel.metadata.data.ImageData; import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.fill.FillConfig; +import com.google.common.collect.Maps; import com.nflg.wms.admin.pojo.dto.*; import com.nflg.wms.admin.repository.PackageMaterialScanRecordRepository; import com.nflg.wms.admin.service.BasdeSerialNumberControllerService; @@ -449,6 +450,12 @@ public class StructuralPackageOrderController extends BaseController { .setMaterialDesc(orderVO.getPackageDesc())).toList() ); List items = structuralPackageOrderTrayItemService.getList(id); + List itemVOs = structuralPackageOrderTrayItemService.getListVOByOrderId(id); + Map deliverStructuralPackageOrderTrayItemMap = CollectionUtil.isNotEmpty(itemVOs) ? + itemVOs.stream().filter(d -> d.getId() != null).collect(Collectors.toMap(DeliverStructuralPackageOrderTrayItemVO::getId, d -> d)) + : Maps.newHashMap(); + + vo.setItems(items.stream().map(item -> { TrayItemVO ivo = Convert.convert(TrayItemVO.class, item); // 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空 @@ -472,6 +479,12 @@ public class StructuralPackageOrderController extends BaseController { ivo.setStoreNum(item.getStoreNum()); } } + + DeliverStructuralPackageOrderTrayItemVO itemVO = deliverStructuralPackageOrderTrayItemMap.get(item.getId()); + if (itemVO != null) { + ivo.setDrawingNo(itemVO.getDrawingNo()); + } + return ivo; }).toList()); return ApiResult.success(vo);