From 9cb6e1e2c39d1e7e0dffca517181b2ccff44da6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Mon, 1 Dec 2025 17:59:00 +0800
Subject: [PATCH] =?UTF-8?q?refactor(structural-package):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=92=A2=E6=9E=84=E5=8C=85=E8=AE=A2=E5=8D=95=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正了托盘数量及重量累加的缩进格式
- 替换钢构包物料ID获取逻辑，改为使用PackageVO整体对象
- 在订单项中增加包号、包描述和包订单号字段设置
- 订单项中计算并设置托盘总重量字段
- 结构体DTO增加packageOrderNo、packageDesc、workbenchCode和weight字段
- workbenchCode通过modelNo与workbenchNo拼接生成
---
 .../StructuralPackageOrderController.java     | 13 ++++++------
 .../dto/StructuralPackageOrderImportDTO.java  | 20 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 7 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 24cbfdce..c6ba13f1 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
@@ -996,15 +996,13 @@ public class StructuralPackageOrderController extends BaseController {
                 }
             }
             String materialNo = StrUtil.trim(data.get("钢构包物料*").toString());
-            Long materialId = null;
+            PackageVO packageVO = null;
             if (StrUtil.isBlank(materialNo)) {
                 sb.append("钢构包物料不能为空;");
             } else {
-                PackageVO packageVO = structuralPackageService.getCurrent(materialNo);
+                packageVO = structuralPackageService.getCurrent(materialNo);
                 if (Objects.isNull(packageVO)) {
                     sb.append("钢构包物料无效;");
-                } else {
-                    materialId = packageVO.getId();
                 }
             }
             String expectDeliveryDate = StrUtil.trim(data.get("期望交期").toString());
@@ -1066,8 +1064,10 @@ public class StructuralPackageOrderController extends BaseController {
                         .setModelNo(modelNo)
                         .setWorkbenchId(workbenchId)
                         .setWorkbenchNo(workbenchNo)
-                        .setPackageId(materialId)
-                        .setMaterialNo(materialNo)
+                        .setPackageOrderNo(packageVO.getOrderNo())
+                        .setPackageId(packageVO.getId())
+                        .setPackageNo(materialNo)
+                        .setPackageDesc(packageVO.getName())
                         .setDeliveryDate(expectDeliveryDate)
                         .setExternalOrderNo(poNum)
                         .setRowNo(rowNo)
@@ -1092,6 +1092,7 @@ public class StructuralPackageOrderController extends BaseController {
         } else {
             list.forEach(item -> {
                 item.setTray(generateTray(item.getPackageId(), item.getNum(), item.getTransportNum()));
+                item.setWeight(item.getTray().getItems().stream().map(TrayItemVO::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add));
             });
             return ApiResult.success(list);
         }
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/StructuralPackageOrderImportDTO.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/StructuralPackageOrderImportDTO.java
index 5771e9b3..4b879021 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/StructuralPackageOrderImportDTO.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/StructuralPackageOrderImportDTO.java
@@ -10,10 +10,17 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 public class StructuralPackageOrderImportDTO {
 
+    private String packageOrderNo;
+
     /**
      * 钢构包料号
      */
-    private String materialNo;
+    private String packageNo;
+
+    /**
+     * 钢构包描述
+     */
+    private String packageDesc;
 
     /**
      * 钢构包id
@@ -55,6 +62,12 @@ public class StructuralPackageOrderImportDTO {
      */
     private String workbenchNo;
 
+    private String workbenchCode;
+
+    public String getWorkbenchCode() {
+        return modelNo + workbenchNo;
+    }
+
     /**
      * 期望交期
      */
@@ -75,6 +88,11 @@ public class StructuralPackageOrderImportDTO {
      */
     private BigDecimal num;
 
+    /**
+     * 总重
+     */
+    private BigDecimal weight;
+
     /**
      * 未收货数量
      */