From ed1091ce3e85c480743ac2e13473e778a02246a9 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 05 十二月 2024 16:48:47 +0800
Subject: [PATCH] #update 明细统计部分导出
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 8 ++++++++
src/main/java/com/zy/asrs/entity/LocDetl.java | 3 ++-
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 1 -
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 3 +++
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index c49612c..713da44 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -189,6 +189,14 @@
.where("loc_no like '" +row +"%'");
}
List<LocDetl> list = locDetlService.selectList(wrapper);
+ for (LocDetl item : list) {
+ if (item.getSpecs() != null) {
+ item.setSpecs(item.getSpecs().replace("\"", "\"\"")); // 杞箟鍙屽紩鍙�
+ }
+ if (item.getBrand() != null) {
+ item.setBrand(item.getBrand().replace("\"", "\"\""));
+ }
+ }
return R.ok(exportSupport(list, fields));
}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 5617914..ca5b7dd 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -44,7 +44,7 @@
private String maktx;
@ApiModelProperty(value= "鎵瑰彿")
-// @ExcelProperty("鎵瑰彿")
+ @ExcelProperty("鎵瑰彿")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -53,6 +53,7 @@
private String orderNo;
@ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty("瑙勬牸")
private String specs;
@ApiModelProperty(value= "鍨嬪彿")
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index 8252ee3..5b206ba 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -6,7 +6,6 @@
arrRemove(detlCols, "field", "anfme")
arrRemove(detlCols, "field", "zpallet")
cols.push.apply(cols, detlCols);
- cols.push({field: 'memo$', align: 'center',title: '澶囨敞', hide: false})
return cols;
}
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index 740be08..9b95556 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -60,6 +60,9 @@
<div class="layui-btn-container layui-col-md1">
<button class="layui-btn" lay-event="exportAll" style="margin-top: -0px">瀵煎嚭鍏ㄩ儴</button>
</div>
+ <div class="layui-btn-container">
+ <button class="layui-btn" lay-event="exportData" >瀵煎嚭閮ㄥ垎</button>
+ </div>
</script>
--
Gitblit v1.9.1