From a5884be7e6e898ac891f57adf9a69ce0699884d3 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 23 九月 2024 08:12:54 +0800
Subject: [PATCH] 证书

---
 src/main/java/com/zy/asrs/entity/StockStatisDTO.java     |    6 ++++++
 src/main/webapp/static/js/locDetlStatis/locDetlStatis.js |    6 +++++-
 src/main/webapp/views/locDetlStatis/locDetlStatis.html   |    2 +-
 src/main/resources/mapper/LocDetlMapper.xml              |    6 ++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/StockStatisDTO.java b/src/main/java/com/zy/asrs/entity/StockStatisDTO.java
index 39b8b45..76a601a 100644
--- a/src/main/java/com/zy/asrs/entity/StockStatisDTO.java
+++ b/src/main/java/com/zy/asrs/entity/StockStatisDTO.java
@@ -18,4 +18,10 @@
     private String   outOrderNo;
     private String   batch;
     private String   model;
+
+    private String   proType;
+    private String   color;
+    private String   luHao;
+    private String   packing;
+
 }
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 9f2b3a8..8eb936b 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -521,6 +521,12 @@
         <id column="outOrderNo" property="outOrderNo" />
         <id column="batch" property="batch" />
         <id column="model" property="model" />
+
+        <id column="luHao" property="luHao" />
+        <id column="packing" property="packing" />
+        <id column="proType" property="proType" />
+        <id column="color" property="color" />
+
     </resultMap>
 
     <select id="asrsAndErpList" resultMap="stockStatisDTO">
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index d262edf..55a543c 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -38,7 +38,11 @@
             {field: 'maktx', title:'浜у搧鍚嶇О', align: 'center'},
             {field: 'pgNo', title:'娲惧伐鍗曞彿', align: 'center'},
             {field: 'outOrderNo', title:'璁㈠崟鍙�', align: 'center'},
-            {field: 'batch', title:'鎵规', align: 'center'}
+            {field: 'batch', title:'鎵规', align: 'center'},
+            {field: 'proType', title:'灞炴��', align: 'center'},
+            {field: 'color', title:'棰滆壊', align: 'center',hidden: true},
+            {field: 'luhao', title:'鐐夊彿', align: 'center',hidden: true},
+            {field: 'packing', title:'鍥剧焊', align: 'center',hidden: true}
         ]],
         request: {
             pageName: 'curr',
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index c99fc8a..2b93746 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -92,7 +92,7 @@
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/locDetlStatis/locDetlStatis.js?v=1" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/locDetlStatis/locDetlStatis.js?v=2" charset="utf-8"></script>
 
 </body>
 </html>

--
Gitblit v1.9.1