From a00ec8232a0b2b5e0a18ca1152c61e695dab1d14 Mon Sep 17 00:00:00 2001 From: 10002617 Date: Thu, 18 Jun 2026 10:18:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1573=20=E6=89=98=E7=9B=98=E8=80=81=E9=BC=A0?= =?UTF-8?q?=E5=9B=BE=E6=89=93=E5=8D=B0=E9=A1=B5=E9=9D=A2=EF=BC=8C=E3=80=90?= =?UTF-8?q?=E6=80=BB=E9=87=8D=E3=80=91=E6=B2=A1=E5=8F=96=E5=88=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/controller/StructuralPackageOrderController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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..c3b16cb7 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 @@ -557,6 +557,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 +568,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)); From f7ddc0d0c485e2b757b9a7cd43bcd61343386c54 Mon Sep 17 00:00:00 2001 From: 10002617 Date: Thu, 18 Jun 2026 11:36:11 +0800 Subject: [PATCH 2/6] =?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); From 774ec0c1559925fa240b4f56ee0c0fd83d585f9e Mon Sep 17 00:00:00 2001 From: 10002617 Date: Thu, 18 Jun 2026 16:44:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?Revert=20"1574=20=E3=80=90=E9=92=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=AE=A2=E5=8D=95=E3=80=91=E5=92=8C=E3=80=90?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F-?= =?UTF-8?q?=E9=92=A2=E7=BB=93=E6=9E=84=E3=80=91=E7=9A=84=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E3=80=90?= =?UTF-8?q?=E5=9B=BE=E5=8F=B7=E3=80=91=E5=88=97"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f7ddc0d0c485e2b757b9a7cd43bcd61343386c54. --- .../StructuralPackageOrderController.java | 13 ------------- 1 file changed, 13 deletions(-) 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 60cae812..c3b16cb7 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,7 +13,6 @@ 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; @@ -450,12 +449,6 @@ 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); // 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空 @@ -479,12 +472,6 @@ 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); From 0876d5fa8b8cfde5a07b3c16620f8193195c7f26 Mon Sep 17 00:00:00 2001 From: 10002617 Date: Thu, 18 Jun 2026 16:44:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?Revert=20"1573=20=E6=89=98=E7=9B=98?= =?UTF-8?q?=E8=80=81=E9=BC=A0=E5=9B=BE=E6=89=93=E5=8D=B0=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E3=80=90=E6=80=BB=E9=87=8D=E3=80=91=E6=B2=A1=E5=8F=96?= =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a00ec8232a0b2b5e0a18ca1152c61e695dab1d14. --- .../wms/admin/controller/StructuralPackageOrderController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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..b787d2c2 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 @@ -557,7 +557,6 @@ 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()) @@ -568,7 +567,7 @@ public class StructuralPackageOrderController extends BaseController { .setEco(trayVO.getEco()) .setWorkbenchCode(trayVO.getWorkbenchCode()) .setCate(trayVO.getPackageCate()) - .setWeight(orderVO.getWeight()) + .setWeight(trayVO.getWeight()) .setDrawingNo(trayVO.getPackageDrawingNo()) .setName(trayVO.getPackageDesc()) .setQrCode(QRCodeUtil.generateQRCodeBase64(trayVO.getPackageNo(), 100, 100)); From 4f9b727fdbdff1b2399d5ef186c8ec9a60942373 Mon Sep 17 00:00:00 2001 From: 10002617 Date: Thu, 18 Jun 2026 10:18:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1573=20=E6=89=98=E7=9B=98=E8=80=81=E9=BC=A0?= =?UTF-8?q?=E5=9B=BE=E6=89=93=E5=8D=B0=E9=A1=B5=E9=9D=A2=EF=BC=8C=E3=80=90?= =?UTF-8?q?=E6=80=BB=E9=87=8D=E3=80=91=E6=B2=A1=E5=8F=96=E5=88=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/controller/StructuralPackageOrderController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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..c3b16cb7 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 @@ -557,6 +557,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 +568,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)); From 29b5881f39d86e6a768aaac8553154226b96f1e8 Mon Sep 17 00:00:00 2001 From: 10002617 Date: Thu, 18 Jun 2026 11:36:11 +0800 Subject: [PATCH 6/6] =?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);