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

Merge remote-tracking branch 'origin/master-hlq20260506ganggoubao' into develop

This commit is contained in:
10001392 2026-05-11 17:33:25 +08:00
parent d948a2c215 9892ce1d64
commit 5bcf86c22f
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -453,8 +453,20 @@ public class StructuralPackageOrderController extends BaseController {
List<WmsStructuralPackageOrderTrayItem> items = structuralPackageOrderTrayItemService.getList(id); List<WmsStructuralPackageOrderTrayItem> items = structuralPackageOrderTrayItemService.getList(id);
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);
// 由于断开了与托盘的关联，托盘号设置为空 // 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空
ivo.setNo(""); if (item.getTrayId() != null) {
WmsStructuralPackageOrderTray tray = trays.stream()
.filter(t -> t.getId().equals(item.getTrayId()))
.findFirst()
.orElse(null);
if (tray != null) {
ivo.setNo(tray.getNo());
} else {
ivo.setNo("");
}
} else {
ivo.setNo("");
}
// 获取订单下的任意一个托盘状态（如果有托盘的话） // 获取订单下的任意一个托盘状态（如果有托盘的话）
if (CollectionUtil.isNotEmpty(trays)) { if (CollectionUtil.isNotEmpty(trays)) {
WmsStructuralPackageOrderTray firstTray = trays.get(0); WmsStructuralPackageOrderTray firstTray = trays.get(0);