From 2b772f63b18057a976c7a30ceda4703d079ca4fa Mon Sep 17 00:00:00 2001
From: yangyufu <yangyufu@hailiang.com>
Date: Thu, 26 Feb 2026 15:54:22 +0800
Subject: [PATCH] =?UTF-8?q?feat(structivt):=20=E6=B7=BB=E5=8A=A0=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E5=8C=96=E6=95=B0=E6=8D=AE=E6=98=A0=E5=B0=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=20-=20=E8=B0=83=E6=95=B4=E5=AF=BC=E5=87=BAexcel?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BD=8D=E7=BD=AE=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../st/service/impl/StructivtServiceImpl.java | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
index d05c2f3a0..e79777b2d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
@@ -391,11 +391,27 @@ public class StructivtServiceImpl implements StructivtService {
             mp.put("生产时长", json.getString("produce_age"));
             mp.put("产品实际幅宽", json.getString("width"));
             mp.put("客户要求幅宽", json.getString("width_standard"));
+            mp.put("物料标准厚度", json.getString("thickness_request"));
             mp.put("产品厚度", json.getString("thickness"));
             mp.put("单位面积重量", json.getString("mass_per_unit_area"));
             mp.put("净重", json.getString("net_weight"));
             mp.put("毛重", json.getString("box_weight"));
             mp.put("长度", json.getString("length"));
+            mp.put("管件类型", json.getString("paper_type"));
+            mp.put("管件编码", json.getString("paper_code"));
+            mp.put("管件描述", json.getString("paper_name"));
+            if ("1".equals(json.getString("remark"))) {
+                mp.put("超期原因", "客户原因");
+            } else if ("2".equals(json.getString("remark"))) {
+                mp.put("超期原因", "生产质量原因");
+            } else if ("3".equals(json.getString("remark"))) {
+                mp.put("超期原因", "市场原因");
+            } else {
+                mp.put("超期原因", "");
+            }
+            mp.put("是否管控", json.getString("lock_type").equals("88") ? "是" : "否");
+            mp.put("是否需要重打外包装标签", json.getString("isreprintpackageboxlabel"));
+            mp.put("是否需要拆包重打子卷标签", json.getString("isunpackbox"));
             mp.put("接头数", json.getString("joint_type"));
             mp.put("计划外分切的子卷", json.getString("is_un_plan_production"));
             String unPlanProductProperty1 = json.getString("un_plan_product_property1");
@@ -414,22 +430,6 @@ public class StructivtServiceImpl implements StructivtService {
             }
             mp.put("子卷的物性值2", json.getString("un_plan_product_property2"));
             mp.put("子卷的物性值3", json.getString("un_plan_product_property3"));
-            if ("1".equals(json.getString("remark"))) {
-                mp.put("超期原因", "客户原因");
-            } else if ("2".equals(json.getString("remark"))) {
-                mp.put("超期原因", "生产质量原因");
-            } else if ("3".equals(json.getString("remark"))) {
-                mp.put("超期原因", "市场原因");
-            } else {
-                mp.put("超期原因", "");
-            }
-            mp.put("是否管控", json.getString("lock_type").equals("88") ? "是" : "否");
-            mp.put("是否需要重打外包装标签", json.getString("isreprintpackageboxlabel"));
-            mp.put("是否需要拆包重打子卷标签", json.getString("isunpackbox"));
-            mp.put("物料标准厚度", json.getString("thickness_request"));
-            mp.put("管件类型", json.getString("paper_type"));
-            mp.put("管件编码", json.getString("paper_code"));
-            mp.put("管件描述", json.getString("paper_name"));
             list.add(mp);
         }
         FileUtil.downloadExcel(list, response);