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 b787d2c2..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); @@ -557,6 +570,7 @@ public class StructuralPackageOrderController extends BaseController { DeliverStructuralPackageOrderExtendVO trayVO = structuralPackageOrderTrayService.getInfo(firstTray.getId()); VUtil.trueThrowBusinessError(Objects.isNull(trayVO)).throwMessage("数据不存在"); + DeliverStructuralPackageOrderVO orderVO = structuralPackageOrderService.getInfo(id); PackageVO vo = new PackageVO() .setNo(trayVO.getPackageNo()) .setExternalOrderNo(trayVO.getExternalOrderNo()) @@ -567,7 +581,7 @@ public class StructuralPackageOrderController extends BaseController { .setEco(trayVO.getEco()) .setWorkbenchCode(trayVO.getWorkbenchCode()) .setCate(trayVO.getPackageCate()) - .setWeight(trayVO.getWeight()) + .setWeight(orderVO.getWeight()) .setDrawingNo(trayVO.getPackageDrawingNo()) .setName(trayVO.getPackageDesc()) .setQrCode(QRCodeUtil.generateQRCodeBase64(trayVO.getPackageNo(), 100, 100));