From ddb173948bcb021a0b8099a69cc3da3071f33ca4 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 17 六月 2020 15:09:13 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/basWhs/basWhs.js | 1 src/main/webapp/views/locDetl/locDetl.html | 14 ++----- src/main/webapp/static/js/rowLastno/rowLastno.js | 1 src/main/webapp/static/js/basCrnError/basCrnError.js | 1 src/main/webapp/static/js/pakStore/emptyOut.js | 1 src/main/webapp/views/wrkMast/wrkDetl.html | 1 src/main/webapp/static/js/basDevp/basDevp.js | 1 src/main/webapp/static/js/operateLog/operateLog.js | 1 src/main/webapp/static/js/wrkMast/wrkMast.js | 1 src/main/webapp/static/js/stoMan/stoQue.js | 2 src/main/webapp/static/js/basLocType/basLocType.js | 1 src/main/webapp/static/js/permission/permission.js | 1 src/main/webapp/static/js/resource/resource.js | 1 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 1 src/main/webapp/views/stoMan/stoQue.html | 15 ++----- src/main/webapp/static/js/config/config.js | 1 src/main/webapp/static/js/user/user.js | 1 src/main/webapp/static/js/wrkLastno/wrkLastno.js | 1 src/main/webapp/static/js/wrkDetl/wrkDetl.js | 1 src/main/webapp/static/js/report/stayTime.js | 1 src/main/webapp/static/js/report/reportStockUse.js | 1 src/main/java/com/zy/asrs/controller/LocDetlController.java | 2 src/main/webapp/static/js/basCrnStatus/basCrnStatus.js | 1 src/main/webapp/static/js/host/host.js | 1 src/main/webapp/static/js/role/role.js | 1 src/main/webapp/static/js/staDesc/staDesc.js | 1 src/main/webapp/views/pakStore/matQuery.html | 2 + src/main/webapp/static/js/api/api.js | 1 src/main/webapp/static/js/locDetl/locDetl.js | 3 + src/main/webapp/static/js/basWrkIotype/basWrkIotype.js | 1 src/main/webapp/static/js/userLogin/userLogin.js | 1 src/main/webapp/static/js/locMast/locMast.js | 1 src/main/webapp/static/js/basWrkStatus/basWrkStatus.js | 1 33 files changed, 41 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index 1904569..de9b64c 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -59,7 +59,7 @@ } else if (entry.getKey().endsWith("<")) { wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue()))); } else { - wrapper.eq(entry.getKey(), String.valueOf(entry.getValue())); + wrapper.like(entry.getKey(), String.valueOf(entry.getValue())); } } } diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index e18f821..2a0ef7b 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -194,6 +194,7 @@ } // 鐢熸垚宸ヤ綔妗f槑缁� for (LocDetlDto detlDto : dto.getLocDetlDtos()) { + if (detlDto.getCount() <= 0.0D) {continue;} WrkDetl wrkDetl = new WrkDetl(); wrkDetl.setWrkNo(workNo); wrkDetl.setIoTime(new Date()); diff --git a/src/main/webapp/static/js/api/api.js b/src/main/webapp/static/js/api/api.js index 3a6b2af..77294f3 100644 --- a/src/main/webapp/static/js/api/api.js +++ b/src/main/webapp/static/js/api/api.js @@ -13,6 +13,7 @@ url: baseUrl+'/api/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], toolbar: '#toolbar', cellMinWidth: 50, cols: [[ diff --git a/src/main/webapp/static/js/basCrnError/basCrnError.js b/src/main/webapp/static/js/basCrnError/basCrnError.js index 9d2b9bc..c72dc32 100644 --- a/src/main/webapp/static/js/basCrnError/basCrnError.js +++ b/src/main/webapp/static/js/basCrnError/basCrnError.js @@ -13,6 +13,7 @@ url: baseUrl+'/basCrnError/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, diff --git a/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js b/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js index f60df23..960ccb3 100644 --- a/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js +++ b/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js @@ -13,6 +13,7 @@ url: baseUrl+'/basCrnStatus/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, diff --git a/src/main/webapp/static/js/basDevp/basDevp.js b/src/main/webapp/static/js/basDevp/basDevp.js index 9d60063..956b112 100644 --- a/src/main/webapp/static/js/basDevp/basDevp.js +++ b/src/main/webapp/static/js/basDevp/basDevp.js @@ -13,6 +13,7 @@ url: baseUrl+'/basDevp/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, diff --git a/src/main/webapp/static/js/basLocType/basLocType.js b/src/main/webapp/static/js/basLocType/basLocType.js index 80a46bc..77ccbd3 100644 --- a/src/main/webapp/static/js/basLocType/basLocType.js +++ b/src/main/webapp/static/js/basLocType/basLocType.js @@ -13,6 +13,7 @@ url: baseUrl+'/basLocType/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, diff --git a/src/main/webapp/static/js/basWhs/basWhs.js b/src/main/webapp/static/js/basWhs/basWhs.js index 41d8802..387672a 100644 --- a/src/main/webapp/static/js/basWhs/basWhs.js +++ b/src/main/webapp/static/js/basWhs/basWhs.js @@ -13,6 +13,7 @@ url: baseUrl+'/basWhs/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], toolbar: '#toolbar', cellMinWidth: 50, cols: [[ diff --git a/src/main/webapp/static/js/basWrkIotype/basWrkIotype.js b/src/main/webapp/static/js/basWrkIotype/basWrkIotype.js index cd3ab97..723120b 100644 --- a/src/main/webapp/static/js/basWrkIotype/basWrkIotype.js +++ b/src/main/webapp/static/js/basWrkIotype/basWrkIotype.js @@ -13,6 +13,7 @@ url: baseUrl+'/basWrkIotype/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], // skin: 'line', even: true, toolbar: '#toolbar', diff --git a/src/main/webapp/static/js/basWrkStatus/basWrkStatus.js b/src/main/webapp/static/js/basWrkStatus/basWrkStatus.js index 472760d..a64f6da 100644 --- a/src/main/webapp/static/js/basWrkStatus/basWrkStatus.js +++ b/src/main/webapp/static/js/basWrkStatus/basWrkStatus.js @@ -13,6 +13,7 @@ url: baseUrl+'/basWrkStatus/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], // skin: 'line', even: true, toolbar: '#toolbar', diff --git a/src/main/webapp/static/js/config/config.js b/src/main/webapp/static/js/config/config.js index 757ae01..4043b9c 100644 --- a/src/main/webapp/static/js/config/config.js +++ b/src/main/webapp/static/js/config/config.js @@ -13,6 +13,7 @@ url: baseUrl+'/config/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], toolbar: '#toolbar', cellMinWidth: 50, cols: [[ diff --git a/src/main/webapp/static/js/host/host.js b/src/main/webapp/static/js/host/host.js index 5bf5840..6591e45 100644 --- a/src/main/webapp/static/js/host/host.js +++ b/src/main/webapp/static/js/host/host.js @@ -13,6 +13,7 @@ url: baseUrl+'/host/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], toolbar: '#toolbar', cellMinWidth: 50, cols: [[ diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js index 1012d97..3f7e484 100644 --- a/src/main/webapp/static/js/locDetl/locDetl.js +++ b/src/main/webapp/static/js/locDetl/locDetl.js @@ -12,7 +12,8 @@ headers: {token: localStorage.getItem('token')}, url: baseUrl+'/locDetl/list/auth', page: true, - limit: 10, + limit: 16, + limits: [16, 30, 50, 100, 200, 500], skin: 'line', even: true, toolbar: '#toolbar', diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js index ab74e81..3c0a7d3 100644 --- a/src/main/webapp/static/js/locMast/locMast.js +++ b/src/main/webapp/static/js/locMast/locMast.js @@ -13,6 +13,7 @@ url: baseUrl+'/locMast/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, diff --git a/src/main/webapp/static/js/operateLog/operateLog.js b/src/main/webapp/static/js/operateLog/operateLog.js index 6b9cd08..f0c9e68 100644 --- a/src/main/webapp/static/js/operateLog/operateLog.js +++ b/src/main/webapp/static/js/operateLog/operateLog.js @@ -13,6 +13,7 @@ url: baseUrl+'/operateLog/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, diff --git a/src/main/webapp/static/js/pakStore/emptyOut.js b/src/main/webapp/static/js/pakStore/emptyOut.js index 23eef5d..de3963c 100644 --- a/src/main/webapp/static/js/pakStore/emptyOut.js +++ b/src/main/webapp/static/js/pakStore/emptyOut.js @@ -36,6 +36,7 @@ url: baseUrl+'/locMast/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], where: {loc_type: "D"}, even: true, toolbar: '#toolbar', diff --git a/src/main/webapp/static/js/permission/permission.js b/src/main/webapp/static/js/permission/permission.js index af6397b..ca06b66 100644 --- a/src/main/webapp/static/js/permission/permission.js +++ b/src/main/webapp/static/js/permission/permission.js @@ -13,6 +13,7 @@ url: baseUrl+'/permission/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], toolbar: '#toolbar', cellMinWidth: 50, cols: [[ diff --git a/src/main/webapp/static/js/report/reportStockUse.js b/src/main/webapp/static/js/report/reportStockUse.js index e107c87..11e0465 100644 --- a/src/main/webapp/static/js/report/reportStockUse.js +++ b/src/main/webapp/static/js/report/reportStockUse.js @@ -14,6 +14,7 @@ url: baseUrl+'/report/viewStockUseList.action', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], toolbar: '#toolbar', cellMinWidth: 50, cols: [[ diff --git a/src/main/webapp/static/js/report/stayTime.js b/src/main/webapp/static/js/report/stayTime.js index 5620959..16d0eb8 100644 --- a/src/main/webapp/static/js/report/stayTime.js +++ b/src/main/webapp/static/js/report/stayTime.js @@ -14,6 +14,7 @@ url: baseUrl+'/report/viewStayTimeList.action', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], toolbar: '#toolbar', cellMinWidth: 50, cols: [[ diff --git a/src/main/webapp/static/js/resource/resource.js b/src/main/webapp/static/js/resource/resource.js index f1b29af..df9ecf4 100644 --- a/src/main/webapp/static/js/resource/resource.js +++ b/src/main/webapp/static/js/resource/resource.js @@ -13,6 +13,7 @@ url: baseUrl+'/resource/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], toolbar: '#toolbar', cellMinWidth: 50, cols: [[ diff --git a/src/main/webapp/static/js/role/role.js b/src/main/webapp/static/js/role/role.js index c98cfe7..3b91de1 100644 --- a/src/main/webapp/static/js/role/role.js +++ b/src/main/webapp/static/js/role/role.js @@ -32,6 +32,7 @@ url: baseUrl+'/role/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], toolbar: '#toolbar', cellMinWidth: 50, cols: [[ diff --git a/src/main/webapp/static/js/rowLastno/rowLastno.js b/src/main/webapp/static/js/rowLastno/rowLastno.js index 143e9bb..8f96187 100644 --- a/src/main/webapp/static/js/rowLastno/rowLastno.js +++ b/src/main/webapp/static/js/rowLastno/rowLastno.js @@ -13,6 +13,7 @@ url: baseUrl+'/rowLastno/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, diff --git a/src/main/webapp/static/js/staDesc/staDesc.js b/src/main/webapp/static/js/staDesc/staDesc.js index 3a36a69..5b259e0 100644 --- a/src/main/webapp/static/js/staDesc/staDesc.js +++ b/src/main/webapp/static/js/staDesc/staDesc.js @@ -13,6 +13,7 @@ url: baseUrl+'/staDesc/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js index d191d10..80f3022 100644 --- a/src/main/webapp/static/js/stoMan/stoQue.js +++ b/src/main/webapp/static/js/stoMan/stoQue.js @@ -20,7 +20,7 @@ cols: [[ {type: 'checkbox'} ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'} - ,{field: 'locType$', align: 'center',title: '搴撲綅鐘舵��', width: 180} + ,{field: 'locType$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'} ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'} ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'} ,{field: 'row1', align: 'center',title: '鎺�'} diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js index 670b53c..c7f42ca 100644 --- a/src/main/webapp/static/js/user/user.js +++ b/src/main/webapp/static/js/user/user.js @@ -13,6 +13,7 @@ url: baseUrl+'/user/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], toolbar: '#toolbar', even: true, cellMinWidth: 50, diff --git a/src/main/webapp/static/js/userLogin/userLogin.js b/src/main/webapp/static/js/userLogin/userLogin.js index 053dd15..f0907ef 100644 --- a/src/main/webapp/static/js/userLogin/userLogin.js +++ b/src/main/webapp/static/js/userLogin/userLogin.js @@ -13,6 +13,7 @@ url: baseUrl+'/userLogin/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], toolbar: '#toolbar', cellMinWidth: 50, cols: [[ diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js index 4850fce..5b139c6 100644 --- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js +++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js @@ -13,6 +13,7 @@ url: baseUrl+'/wrkDetl/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, diff --git a/src/main/webapp/static/js/wrkLastno/wrkLastno.js b/src/main/webapp/static/js/wrkLastno/wrkLastno.js index 34e8c01..233df44 100644 --- a/src/main/webapp/static/js/wrkLastno/wrkLastno.js +++ b/src/main/webapp/static/js/wrkLastno/wrkLastno.js @@ -13,6 +13,7 @@ url: baseUrl+'/wrkLastno/list/auth', page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js index 8baef7f..6b594d7 100644 --- a/src/main/webapp/static/js/wrkMast/wrkMast.js +++ b/src/main/webapp/static/js/wrkMast/wrkMast.js @@ -695,6 +695,7 @@ where: {wrk_no: param}, page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html index d975f5b..47c27dc 100644 --- a/src/main/webapp/views/locDetl/locDetl.html +++ b/src/main/webapp/views/locDetl/locDetl.html @@ -14,20 +14,14 @@ <!-- 鎼滅储鏍� --> <div id="search-box" class="layui-form layui-card-header"> - <div class="layui-inline" style="width:31%;"> + <div class="layui-inline"> <label class="layui-form-label">搴� 浣� 鍙凤細</label> - <div class="layui-input-inline cool-auto-complete"> - <input id="locNo" class="layui-input" name="loc_no" type="text" onkeyup="check(this.id, 'locDetl')" autocomplete="off" style="display: none"> - <input id="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()> - <div class="cool-auto-complete-window"> - <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="loc_no" placeholder="璇疯緭鍏�" autocomplete="off"> </div> </div> <!-- 寰呮坊鍔� --> - <div id="data-search-btn" class="layui-btn-container layui-form-item"> + <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> <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button> </div> diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html index 5af04f7..84eb658 100644 --- a/src/main/webapp/views/pakStore/matQuery.html +++ b/src/main/webapp/views/pakStore/matQuery.html @@ -119,6 +119,8 @@ for (var i=0;i<data.length;i++){ data[i]["count"] = parent.initCountVal; } + + parent.matCodeData.push.apply(parent.matCodeData, data); parent.tableIns.reload({data: parent.matCodeData}); parent.layer.close(parent.matCodeLayerIdx); diff --git a/src/main/webapp/views/stoMan/stoQue.html b/src/main/webapp/views/stoMan/stoQue.html index 6fb4ff9..7dfbc7c 100644 --- a/src/main/webapp/views/stoMan/stoQue.html +++ b/src/main/webapp/views/stoMan/stoQue.html @@ -11,7 +11,6 @@ <link rel="stylesheet" href="../../static/css/common.css" media="all"> <style> #btn-export { - float:initial !important; } #refresh-sto { display: none; @@ -28,16 +27,10 @@ <!-- 鎼滅储鏍� --> <div id="search-box" class="layui-form layui-card-header"> - <div class="layui-inline" > + <div class="layui-inline"> <label class="layui-form-label">搴� 浣� 鍙凤細</label> - <div class="layui-input-inline cool-auto-complete"> - <input id="locNo" class="layui-input" name="loc_no" type="text" onkeyup="check(this.id, 'locDetl')" autocomplete="off" style="display: none"> - <input id="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()> - <div class="cool-auto-complete-window"> - <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> - <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> - </select> - </div> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="loc_no" placeholder="璇疯緭鍏�" autocomplete="off"> </div> </div> @@ -49,7 +42,7 @@ </div> <script type="text/html" id="toolbar"> <div class="layui-btn-container"> - <button class="layui-btn layui-btn-sm" id="refresh-sto" lay-event="refreshSto">鏇存柊搴撳瓨</button> + <button class="layui-btn layui-btn-normal layui-btn-lg" id="refresh-sto" lay-event="refreshSto" style="margin-left: 10px">鏇存柊搴撳瓨</button> <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button> </div> </script> diff --git a/src/main/webapp/views/wrkMast/wrkDetl.html b/src/main/webapp/views/wrkMast/wrkDetl.html index 9313b00..008f51c 100644 --- a/src/main/webapp/views/wrkMast/wrkDetl.html +++ b/src/main/webapp/views/wrkMast/wrkDetl.html @@ -42,6 +42,7 @@ where: {wrk_no: parent.wrkNo}, page: true, limit: 16, + limits: [16, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, -- Gitblit v1.9.1