From 35b61a9fdad4d8abcb93465a38779b004b66590b Mon Sep 17 00:00:00 2001
From: suncz <suncz@izpec.com>
Date: Sat, 11 Oct 2025 15:19:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=98=8E=E7=BB=86=E8=A1=A8?=
 =?UTF-8?q?=E7=BD=91=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=98=B6=E6=AE=B5=E6=AF=94=E8=BE=83=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8AExcel=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vverp/service/MaterialOrderService.java   |  15 +++++++++++++++
 .../resources/excel/template/specialMO.xlsx   | Bin 9168 -> 9393 bytes
 .../template/materialOrder/addDeviceFile.html |   2 +-
 .../template/materialOrder/addFile.html       |   2 +-
 .../template/materialOrder/addFile2.html      |   2 +-
 .../template/materialOrder/addPrice.html      |   2 +-
 .../WEB-INF/template/purchaseStock/list.html  |   2 +-
 7 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/vverp/service/MaterialOrderService.java b/src/main/java/com/vverp/service/MaterialOrderService.java
index 27eb7c6..dcb7740 100644
--- a/src/main/java/com/vverp/service/MaterialOrderService.java
+++ b/src/main/java/com/vverp/service/MaterialOrderService.java
@@ -1208,6 +1208,9 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
             lm.put("line",item.get("line"));
             lm.put("code",item.get("code"));
             lm.put("longDescription", item.get("longDescription"));
+            lm.put("diameterL",item.get("diameterL"));
+            lm.put("diameterS",item.get("diameterS"));
+            lm.put("jacketSpec",item.get("jacketSpec"));
             lm.put("needCount", item.get("needCount"));
             lm.put("preCount", item.get("preCount"));
             lm.put("errorMessage", item.get("errorMessage"));
@@ -1288,6 +1291,9 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
                     map.put("line",item.getLineAccount());
                     map.put("code",item.getProductCode());
                     map.put("longDescription",item.getLongDescription());
+                    map.put("diameterL",item.getDiameterL());
+                    map.put("diameterS",item.getDiameterS());
+                    map.put("jacketSpec",item.getJacketSpec());
                     map.put("needCount",item.getNeedCount());
                     map.put("preCount",prevCount);
                     map.put("errorMessage","当前阶段较以往阶段采购数量减少");
@@ -1301,6 +1307,9 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
                     map.put("line",item.getLineAccount());
                     map.put("code",item.getProductCode());
                     map.put("longDescription",item.getLongDescription());
+                    map.put("diameterL",item.getDiameterL());
+                    map.put("diameterS",item.getDiameterS());
+                    map.put("jacketSpec",item.getJacketSpec());
                     map.put("needCount",item.getNeedCount());
                     map.put("preCount",prevCount);
                     map.put("errorMessage","当前阶段较以往阶段采购数量增加");
@@ -1317,6 +1326,9 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
                 map.put("line",item.getLineAccount());
                 map.put("code",item.getProductCode());
                 map.put("longDescription",item.getLongDescription());
+                map.put("diameterL",item.getDiameterL());
+                map.put("diameterS",item.getDiameterS());
+                map.put("jacketSpec",item.getJacketSpec());
                 map.put("needCount",item.getNeedCount());
                 map.put("preCount",' ');
                 map.put("errorMessage","当前阶段料单新增采购");
@@ -1393,6 +1405,9 @@ public class MaterialOrderService extends BaseOrderService<MaterialOrder, Long>
             map.put("line", MaterialOrderItemConsts.getPrevStageLineAccount(materialOrder.getIgnoreLineAccount(), entry.getValue().getLineAccount()));
             map.put("code",entry.getValue().getProductCode());
             map.put("longDescription",entry.getValue().getLongDescription());
+            map.put("diameterL",entry.getValue().getDiameterL());
+            map.put("diameterS",entry.getValue().getDiameterS());
+            map.put("jacketSpec",entry.getValue().getJacketSpec());
             map.put("needCount",' ');
             map.put("preCount",prevMap.get(entry.getKey()));
             map.put("errorMessage","以往阶段已采购，当前阶段没有采购");
diff --git a/src/main/resources/excel/template/specialMO.xlsx b/src/main/resources/excel/template/specialMO.xlsx
index 1c1e72be70d46d3992dc6b1a92f033a4a9a1f0bd..8cda3a7c07790420b8a74da38c485de043ea8fb9 100644
GIT binary patch
delta 5745
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

delta 5513
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
X1w`}TW2ygigF-@BxG`E7{^<S%Mc+!R

diff --git a/src/main/webapp/WEB-INF/template/materialOrder/addDeviceFile.html b/src/main/webapp/WEB-INF/template/materialOrder/addDeviceFile.html
index 05fd31e..3e63ea1 100644
--- a/src/main/webapp/WEB-INF/template/materialOrder/addDeviceFile.html
+++ b/src/main/webapp/WEB-INF/template/materialOrder/addDeviceFile.html
@@ -22,7 +22,7 @@
 <!--                <a class="form-setting" href="javascript:Dialog.functionDialog(null, null, '/admin/common/formSetting.html?name=product');">表单设置</a>-->
 <!--            </div>-->
         </div>
-        <div class="submitBody" data-id="addDevice" style="position:absolute;top: 20%;">
+        <div class="submitBody" data-id="addDevice" style="position:absolute;top: 40px;">
             <style>
                 .input-wrapper {
                     float: left;
diff --git a/src/main/webapp/WEB-INF/template/materialOrder/addFile.html b/src/main/webapp/WEB-INF/template/materialOrder/addFile.html
index e334bd1..ea91b01 100644
--- a/src/main/webapp/WEB-INF/template/materialOrder/addFile.html
+++ b/src/main/webapp/WEB-INF/template/materialOrder/addFile.html
@@ -22,7 +22,7 @@
             <!--                <a class="form-setting" href="javascript:Dialog.functionDialog(null, null, '/admin/common/formSetting.html?name=product');">表单设置</a>-->
             <!--            </div>-->
         </div>
-        <div class="submitBody" data-id="addFile" style="position:absolute;top: 20%;">
+        <div class="submitBody" data-id="addFile" style="position:absolute;top: 40px;">
             <style>
                 .input-wrapper {
                     float: left;
diff --git a/src/main/webapp/WEB-INF/template/materialOrder/addFile2.html b/src/main/webapp/WEB-INF/template/materialOrder/addFile2.html
index 7c25a41..3e91c5d 100644
--- a/src/main/webapp/WEB-INF/template/materialOrder/addFile2.html
+++ b/src/main/webapp/WEB-INF/template/materialOrder/addFile2.html
@@ -22,7 +22,7 @@
 <!--                <a class="form-setting" href="javascript:Dialog.functionDialog(null, null, '/admin/common/formSetting.html?name=product');">表单设置</a>-->
 <!--            </div>-->
         </div>
-        <div class="submitBody" data-id="addFile" style="position:absolute;top: 20%;">
+        <div class="submitBody" data-id="addFile" style="position:absolute;top: 40px;">
             <style>
                 .input-wrapper {
                     float: left;
diff --git a/src/main/webapp/WEB-INF/template/materialOrder/addPrice.html b/src/main/webapp/WEB-INF/template/materialOrder/addPrice.html
index 5a37968..57d097f 100644
--- a/src/main/webapp/WEB-INF/template/materialOrder/addPrice.html
+++ b/src/main/webapp/WEB-INF/template/materialOrder/addPrice.html
@@ -22,7 +22,7 @@
 <!--                <a class="form-setting" href="javascript:Dialog.functionDialog(null, null, '/admin/common/formSetting.html?name=product');">表单设置</a>-->
 <!--            </div>-->
         </div>
-        <div class="submitBody" data-id="addFile" style="position:absolute;top: 20%;">
+        <div class="submitBody" data-id="addFile" style="position:absolute;top: 40px;">
             <style>
                 .input-wrapper {
                     float: left;
diff --git a/src/main/webapp/WEB-INF/template/purchaseStock/list.html b/src/main/webapp/WEB-INF/template/purchaseStock/list.html
index 4dbd94d..9ca7d8a 100644
--- a/src/main/webapp/WEB-INF/template/purchaseStock/list.html
+++ b/src/main/webapp/WEB-INF/template/purchaseStock/list.html
@@ -5,7 +5,7 @@
 <div class="appPage listPage">
     <h1 class="page-title">发货记录列表</h1>
     <h1 class="page-sub-title" th:text="|共${page.total}条记录|"></h1>
-    <form id="listForm" th:action="|purchaseStock/list.html|" method="post">
+    <form id="listForm" th:action="|purchaseStock/list.html?pageType=${pageType}|" method="post">
         <input type="hidden" name="displayMode" th:value="${displayMode}">
         <div class="toolBar">
             <input hidden name="pageType" th:value="${pageType}"/>