From 17533e5e1044e3d157c916ecb360f3e46923ed6d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 05 八月 2025 09:45:49 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/importexcle/ImportReviewDto.java      |   34 +++++++++++++++++++++-------------
 src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java |   15 ++++++++-------
 src/main/webapp/static/js/review/review.js                      |   10 +++++-----
 3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/zy/asrs/importexcle/ImportReviewDto.java b/src/main/java/com/zy/asrs/importexcle/ImportReviewDto.java
index f37c53a..499d1b8 100644
--- a/src/main/java/com/zy/asrs/importexcle/ImportReviewDto.java
+++ b/src/main/java/com/zy/asrs/importexcle/ImportReviewDto.java
@@ -16,30 +16,38 @@
     @ExcelProperty(value = "鍗曟嵁缂栧彿", index = 0)
     private String column1;
 
-    @ExcelProperty(value = "鐗╂枡缂栧彿", index = 1)
+    @ExcelProperty(value = "瑙勬牸", index = 3)
     private String column2;
 
-    @ExcelProperty(value = "鐗╂枡鍚嶇О", index = 2)
+
+    @ExcelProperty(value = "鎵规鍙�", index = 6)
     private String column3;
 
-    @ExcelProperty(value = "瑙勬牸", index = 3)
-    private String column4;
+
+    @ExcelProperty(value = "鍑哄簱鏁伴噺", index = 8)
+    private Double column4;
+
+
+    @ExcelProperty(value = "鐗╂枡缂栧彿", index = 1)
+    private String column5;
+
+
+    @ExcelProperty(value = "鐗╂枡鍚嶇О", index = 2)
+    private String column6;
+
+
 
 
     @ExcelProperty(value = "鍗曚綅", index = 4)
-    private String column5;
-
-    @ExcelProperty(value = "鍝佺骇", index = 5)
-    private String column6;
-
-    @ExcelProperty(value = "鎵规鍙�", index = 6)
     private String column7;
 
-    @ExcelProperty(value = "鍗峰彿", index = 7)
+    @ExcelProperty(value = "鍝佺骇", index = 5)
     private String column8;
 
-    @ExcelProperty(value = "鍑哄簱鏁伴噺", index = 8)
-    private Double column9;
+
+    @ExcelProperty(value = "鍗峰彿", index = 7)
+    private String column9;
+
 
     @ExcelProperty(value = "鍑哄簱鏃ユ湡", index = 9)
     private String column10;
diff --git a/src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java b/src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java
index dff9c0c..a32e629 100644
--- a/src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java
+++ b/src/main/java/com/zy/asrs/importexcle/ImportReviewListener.java
@@ -136,14 +136,15 @@
             }
             ReviewDetl orderDetl = new ReviewDetl();
             orderDetl.setOrderNo(importOrderDto.getColumn1());
-            orderDetl.setMatnr(importOrderDto.getColumn2());
-            orderDetl.setMaktx(importOrderDto.getColumn3());
-            orderDetl.setSpecs(importOrderDto.getColumn4());
-            orderDetl.setUnit(importOrderDto.getColumn5());
+            orderDetl.setSpecs(importOrderDto.getColumn2());
+            orderDetl.setBatch(importOrderDto.getColumn3());
+            orderDetl.setAnfme(importOrderDto.getColumn4());
+
+            orderDetl.setMatnr(importOrderDto.getColumn5());
+            orderDetl.setMaktx(importOrderDto.getColumn6());
+            orderDetl.setUnit(importOrderDto.getColumn7());
             //orderDetl.set(importOrderDto.getColumn6());
-            orderDetl.setBatch(importOrderDto.getColumn7());
-            orderDetl.setModel(importOrderDto.getColumn8());
-            orderDetl.setAnfme(importOrderDto.getColumn9());
+            orderDetl.setModel(importOrderDto.getColumn9());
             orderDetl.setDeadTime(importOrderDto.getColumn10());
 
             orderDetl.setOrderId(importOrderDto.getOrderId());
diff --git a/src/main/webapp/static/js/review/review.js b/src/main/webapp/static/js/review/review.js
index cd2d075..155f7b1 100644
--- a/src/main/webapp/static/js/review/review.js
+++ b/src/main/webapp/static/js/review/review.js
@@ -227,7 +227,7 @@
             layer.open({
                 type: 1,
                 title: false,
-                area: '1220px',
+                area: '1020px',
                 offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
                 shade: .01,
                 shadeClose: true,
@@ -244,13 +244,13 @@
                         page: true,
                         cellMinWidth: 100,
                         cols: [[
-                            {field: 'matnr', title: '鐗╄川缂栫爜'},
-                            {field: 'maktx', title: '浜у搧鍚嶇О'},
+                            //{field: 'matnr', title: '鐗╄川缂栫爜'},
+                            //{field: 'maktx', title: '浜у搧鍚嶇О'},
                             {field: 'specs', title: '瑙勬牸鍨嬪彿'},
                             {field: 'batch', title: '鎵规鍙�'},
-                            {field: 'model', title: '鍗峰彿'},
+                            //{field: 'model', title: '鍗峰彿'},
                             {field: 'anfme', title: '鍑哄簱鏁伴噺'},
-                            {field: 'deadTime', title: '鍑哄簱鏃ユ湡'},
+                            //{field: 'deadTime', title: '鍑哄簱鏃ユ湡'},
                             {field: 'inspect$', title: '澶嶆牳鐘舵��'},
                             {field: 'threeCode', title: '澶嶆牳浜�'},
                             {field: 'memo', title: '澶嶆牳澶囨敞'}

--
Gitblit v1.9.1