From 5e2d9c2a73d0981edb8a1c1368ca6457fcddfc11 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 02 四月 2021 11:09:17 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locStatis/locStatis.html | 2
src/main/java/zy/cloud/wms/manager/controller/StatisController.java | 5 +-
src/main/webapp/static/js/locStatis/locStatis.js | 55 ++-------------------------
3 files changed, 8 insertions(+), 54 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/StatisController.java b/src/main/java/zy/cloud/wms/manager/controller/StatisController.java
index 4c787ee..fb0a317 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/StatisController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/StatisController.java
@@ -40,7 +40,7 @@
@RequestParam Map<String, Object> param) {
Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
for (LocDetl locDetl : stockStatis.getRecords()) {
- Mat mat = matService.selectById(locDetl.getMatnr());
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
if (mat != null) {
VersionUtils.setLocDetl(locDetl, mat);
}
@@ -49,11 +49,10 @@
}
@RequestMapping(value = "/stock/statis/export")
- @ManagerAuth
public void stockStatisExport(HttpServletResponse response) throws IOException {
List<LocDetl> excel = locDetlService.getStockStatisExcel();
for (LocDetl locDetl : excel) {
- Mat mat = matService.selectById(locDetl.getMatnr());
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
if (mat != null) {
VersionUtils.setLocDetl(locDetl, mat);
}
diff --git a/src/main/webapp/static/js/locStatis/locStatis.js b/src/main/webapp/static/js/locStatis/locStatis.js
index d1b6518..f607ca0 100644
--- a/src/main/webapp/static/js/locStatis/locStatis.js
+++ b/src/main/webapp/static/js/locStatis/locStatis.js
@@ -20,7 +20,7 @@
// 鏁版嵁娓叉煋
tableIns = table.render({
- elem: '#locDetlStatis',
+ elem: '#locStatis',
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/stock/statis/auth',
page: true,
@@ -46,24 +46,17 @@
statusCode: 200
},
done: function(res, curr, count) {
+ console.log(res)
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
- form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
- res.data[_index][data.value] = 'Y';
- }else{
- res.data[_index][data.value] = 'N';
- }
- });
}
});
// 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(locDetlStatis)', function (obj) {
+ table.on('sort(locStatis)', function (obj) {
var searchData = {};
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
@@ -86,7 +79,7 @@
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(locDetlStatis)', function (obj) {
+ table.on('toolbar(locStatis)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch(obj.event) {
case 'exportAll':
@@ -95,49 +88,11 @@
location.href = baseUrl + "/stock/statis/export";
layer.closeAll('loading');
break;
- case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
- obj.config.cols[0].map(function (col) {
- if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
- titles.push(col.title);
- fields.push(col.field);
- }
- });
- var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- exportData[this.name] = this.value;
- });
- var param = {
- 'locDetl': exportData,
- 'fields': fields
- };
- $.ajax({
- url: baseUrl+"/locDetl/export/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- layer.closeAll();
- if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
- } else if (res.code === 403) {
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg)
- }
- }
- });
- });
- break;
}
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(locDetlStatis)', function(obj){
+ table.on('tool(locStatis)', function(obj){
var data = obj.data;
switch (obj.event) {
// 璇︽儏
diff --git a/src/main/webapp/views/locStatis/locStatis.html b/src/main/webapp/views/locStatis/locStatis.html
index 3f2a060..30fff48 100644
--- a/src/main/webapp/views/locStatis/locStatis.html
+++ b/src/main/webapp/views/locStatis/locStatis.html
@@ -28,7 +28,7 @@
<!-- 琛ㄦ牸 -->
<div class="layui-form">
- <table class="layui-hide" id="locDetlStatis" lay-filter="locDetlStatis"></table>
+ <table class="layui-hide" id="locStatis" lay-filter="locStatis"></table>
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
--
Gitblit v1.9.1