From 192cdd7a66ca100f029981e0c5e3245dee0ac85c Mon Sep 17 00:00:00 2001
From: 李天宇 <876263681@qq.com>
Date: 星期二, 29 十月 2024 12:44:21 +0800
Subject: [PATCH] #update wms修改部分内容实现客户需求

---
 src/main/webapp/static/js/locDetl/locDetl.js             |    2 ++
 src/main/java/com/zy/asrs/entity/LocDetl.java            |    1 +
 src/main/webapp/static/js/locDetlStatis/locDetlStatis.js |    3 +--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index b330cb9..5617914 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -158,6 +158,7 @@
     private Date appeTime;
 
     @ApiModelProperty(value= "澶囨敞")
+    @ExcelProperty("澶囨敞")
     private String memo;
 
     @ApiModelProperty(value= "bom鍙�")
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 30832b2..f1b2fff 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -34,6 +34,8 @@
         ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
         ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
         ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+        ,{field: 'memo$', align: 'center',title: '澶囨敞', hide: false}
+
 
     ];
 
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index fd1da33..8252ee3 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -6,8 +6,7 @@
     arrRemove(detlCols, "field", "anfme")
     arrRemove(detlCols, "field", "zpallet")
     cols.push.apply(cols, detlCols);
-    // cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
-    // )
+    cols.push({field: 'memo$', align: 'center',title: '澶囨敞', hide: false})
     return cols;
 }
 

--
Gitblit v1.9.1