rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1574 【钢结构订单】和【指定打包方式-钢结构】的零件信息页面增加【图号】列

This commit is contained in:
10002617 2026-06-18 11:36:11 +08:00
parent d368ec1515
commit 5e9eaadb8b
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
View File

@ -13,6 +13,7 @@ import com.alibaba.excel.metadata.data.ImageData;
import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.data.WriteCellData;
import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.metadata.fill.FillConfig; 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.pojo.dto.*;
import com.nflg.wms.admin.repository.PackageMaterialScanRecordRepository; import com.nflg.wms.admin.repository.PackageMaterialScanRecordRepository;
import com.nflg.wms.admin.service.BasdeSerialNumberControllerService; import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
@ -449,6 +450,12 @@ public class StructuralPackageOrderController extends BaseController {
.setMaterialDesc(orderVO.getPackageDesc())).toList() .setMaterialDesc(orderVO.getPackageDesc())).toList()
); );
List<WmsStructuralPackageOrderTrayItem> items = structuralPackageOrderTrayItemService.getList(id); List<WmsStructuralPackageOrderTrayItem> items = structuralPackageOrderTrayItemService.getList(id);
List<DeliverStructuralPackageOrderTrayItemVO> itemVOs = structuralPackageOrderTrayItemService.getListVOByOrderId(id);
Map<Long, DeliverStructuralPackageOrderTrayItemVO> 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 -> { vo.setItems(items.stream().map(item -> {
TrayItemVO ivo = Convert.convert(TrayItemVO.class, item); TrayItemVO ivo = Convert.convert(TrayItemVO.class, item);
// 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空 // 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空
@ -472,6 +479,12 @@ public class StructuralPackageOrderController extends BaseController {
ivo.setStoreNum(item.getStoreNum()); ivo.setStoreNum(item.getStoreNum());
} }
} }
DeliverStructuralPackageOrderTrayItemVO itemVO = deliverStructuralPackageOrderTrayItemMap.get(item.getId());
if (itemVO != null) {
ivo.setDrawingNo(itemVO.getDrawingNo());
}
return ivo; return ivo;
}).toList()); }).toList());
return ApiResult.success(vo); return ApiResult.success(vo);