导入明细表网页样式修改，添加阶段比较报告Excel导出字段

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","以往阶段已采购，当前阶段没有采购");

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;

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;

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;

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;

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}"/>