From 96fcfee5c4f0632a9f43af11847708abee15c73f Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期二, 31 八月 2021 09:38:52 +0800
Subject: [PATCH] 1.0.5
---
src/main/webapp/static/js/report/stayTime.js | 11 ++++++++++-
src/main/webapp/views/adjDetl/adjDetl.html | 10 +++++-----
src/main/java/com/zy/asrs/entity/LocDetl.java | 2 ++
src/main/java/com/zy/asrs/entity/WrkDetl.java | 2 ++
src/main/webapp/static/js/adjDetl/adjDetl.js | 2 +-
src/main/webapp/static/js/matStore/matStore.js | 1 -
src/main/webapp/views/staDesc/staDesc.html | 5 +++++
src/main/webapp/static/js/cool.js | 1 +
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 3 +++
src/main/webapp/static/js/wrkDetl/wrkDetl.js | 3 ++-
src/main/webapp/views/report/viewStayTime.html | 2 +-
11 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index ef24c44..f4d2d07 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -58,10 +58,13 @@
public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
+ excludeTrash(param);
ViewStayTimeBean bean = new ViewStayTimeBean();
bean.setPageSize(limit);
bean.setPageNumber(curr);
+ bean.setLoc_no((String) param.get("loc_no"));
List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
+
int count = reportQueryMapper.getViewStayTimeCount(bean);
Page<ViewStayTimeBean> page = new Page<>();
page.setRecords(list);
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 36db1be..f322a38 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -29,10 +29,12 @@
@ApiModelProperty(value= "浜у搧缂栫爜")
@TableId(value = "mat_no", type = IdType.INPUT)
+ @TableField("mat_no")
private String matNo;
@ApiModelProperty(value= "浜у搧鍚嶇О")
@TableId(value = "mat_name")
+ @TableField("mat_name")
private String matName;
@ApiModelProperty(value= "瑙勬牸")
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 584ce60..ef86a17 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -36,10 +36,12 @@
@ApiModelProperty(value= "浜у搧缂栫爜")
@TableId(value = "mat_no")
+ @TableField("mat_no")
private String matNo;
@ApiModelProperty(value= "浜у搧鍚嶇О")
@TableId(value = "mat_name")
+ @TableField("mat_name")
private String matName;
@ApiModelProperty(value= "瑙勬牸")
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index a90bf96..9290245 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -21,7 +21,7 @@
// {type: 'checkbox'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
// {field: 'adjId', align: 'center',title: '搴忓彿'}
- {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ {field: 'locNo$', align: 'center',title: '搴撲綅鍙�',sort:true}
,{field: 'matNo$', align: 'center',title: '浜у搧缂栧彿'}
// ,{field: 'oriCtns', align: 'center',title: '鍘熺鏁�'}
,{field: 'oriQty', align: 'center',title: '鍘熸暟閲�'}
diff --git a/src/main/webapp/static/js/cool.js b/src/main/webapp/static/js/cool.js
index d817c09..1bb67f5 100644
--- a/src/main/webapp/static/js/cool.js
+++ b/src/main/webapp/static/js/cool.js
@@ -16,6 +16,7 @@
function autoShow(id) {
var cac = document.getElementById(id).parentNode;
var cacw = cac.getElementsByClassName("cool-auto-complete-window")[0];
+ console.log(cacw)
if (cacw.style.display === "none" || cacw.style.display === ""){
cacw.style.display = "block";
var cacwi = cacw.getElementsByClassName("cool-auto-complete-window-input")[0];
diff --git a/src/main/webapp/static/js/matStore/matStore.js b/src/main/webapp/static/js/matStore/matStore.js
index 657151f..da52595 100644
--- a/src/main/webapp/static/js/matStore/matStore.js
+++ b/src/main/webapp/static/js/matStore/matStore.js
@@ -160,7 +160,6 @@
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if(count > (qty-inQty) ){
- count.html(59)
layer.msg("鍏ュ簱鏁伴噺涓嶈兘瓒呰繃鍙叆搴撻噺");
}
if (count > 0) {
diff --git a/src/main/webapp/static/js/report/stayTime.js b/src/main/webapp/static/js/report/stayTime.js
index 318ba8e..81ee2f2 100644
--- a/src/main/webapp/static/js/report/stayTime.js
+++ b/src/main/webapp/static/js/report/stayTime.js
@@ -120,6 +120,14 @@
pageCurr = 1;
tableReload(false);
});
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
});
// 鍏抽棴鍔ㄤ綔
@@ -132,8 +140,9 @@
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
+
(child ? parent.tableIns : tableIns).reload({
- where: searchData,
+ where:searchData,
page: {
curr: pageCurr
},
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index 9aad5bf..dc0ee9a 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -37,6 +37,7 @@
pageSize: 'limit'
},
parseData: function (res) {
+ console.log(res)
return {
'code': res.code,
'msg': res.msg,
@@ -322,7 +323,7 @@
// id: $('#id').val(),
wrkNo: $('#wrkNo').val(),
ioTime: top.strToDate($('#ioTime\\$').val()),
- matnr: $('#matnr').val(),
+ matNo: $('#matNo').val(),
lgnum: $('#lgnum').val(),
tbnum: $('#tbnum').val(),
tbpos: $('#tbpos').val(),
diff --git a/src/main/webapp/views/adjDetl/adjDetl.html b/src/main/webapp/views/adjDetl/adjDetl.html
index db35ef2..7d119ce 100644
--- a/src/main/webapp/views/adjDetl/adjDetl.html
+++ b/src/main/webapp/views/adjDetl/adjDetl.html
@@ -30,11 +30,11 @@
<input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
diff --git a/src/main/webapp/views/report/viewStayTime.html b/src/main/webapp/views/report/viewStayTime.html
index 5be39ac..c7aca53 100644
--- a/src/main/webapp/views/report/viewStayTime.html
+++ b/src/main/webapp/views/report/viewStayTime.html
@@ -21,7 +21,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="搴撲綅鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
</div>
</div>
diff --git a/src/main/webapp/views/staDesc/staDesc.html b/src/main/webapp/views/staDesc/staDesc.html
index 0bd2251..8103745 100644
--- a/src/main/webapp/views/staDesc/staDesc.html
+++ b/src/main/webapp/views/staDesc/staDesc.html
@@ -25,6 +25,11 @@
</div>
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="stnDesc" name="stn_desc" class="layui-input cool-auto-complete-div" type="text" placeholder="绔欑偣鍚嶇О" >
+ </div>
+ </div>
<!--<div class="layui-inline">-->
<!--<label class="layui-form-label">缂栥��銆�鍙凤細</label>-->
<!--<div class="layui-input-inline">-->
--
Gitblit v1.9.1