From ed1bbbc669763da0840be52c15773345f804dba8 Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期四, 19 五月 2022 10:50:29 +0800 Subject: [PATCH] Changes --- src/main/webapp/static/js/locDetl/locDetl.js | 4 +- src/main/webapp/views/locDetl/locDetl.html | 6 +++ src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2 + src/main/java/com/zy/asrs/service/LocDetlService.java | 2 + src/main/webapp/views/report/locDetl.html | 2 src/main/java/com/zy/asrs/controller/LocDetlController.java | 10 +++++ src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 17 +++++++- src/main/webapp/views/locDetlStatis/locDetlStatis.html | 17 +++++++- src/main/resources/mapper/LocDetlMapper.xml | 4 ++ src/main/webapp/views/stoMan/stoQue.html | 5 ++ src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 11 +++++ src/main/webapp/static/js/stoMan/stoQue.js | 4 +- 12 files changed, 74 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index 34b0ba9..b25c818 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -227,4 +227,14 @@ .doWrite(excel); } + /** + * 鑾峰彇搴撳瓨鎬绘暟 + * @return + */ + @RequestMapping("/locDetl/count") + public R getAllCount(){ + Integer sum = locDetlService.sum(); + return R.ok(sum); + } + } diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java index 5b36d55..457a7c0 100644 --- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java +++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java @@ -56,4 +56,6 @@ List<StockVo> queryStockTotal(); + + Integer sum(); } diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java index ff3b03b..a068386 100644 --- a/src/main/java/com/zy/asrs/service/LocDetlService.java +++ b/src/main/java/com/zy/asrs/service/LocDetlService.java @@ -46,4 +46,6 @@ List<StockVo> queryStockTotal(); + + Integer sum(); } diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java index 1049a71..10243f8 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java @@ -83,6 +83,17 @@ return this.baseMapper.queryStockTotal(); } + /** + * 鑾峰彇搴撳瓨鎬绘暟 + * @return + */ + @Override + public Integer sum() { + + return this.baseMapper.sum(); + } + + @Override public LocDetl selectItem(String locNo, String matnr, String batch) { return this.baseMapper.selectItem(locNo, matnr, batch); diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml index ab1462b..1202f0b 100644 --- a/src/main/resources/mapper/LocDetlMapper.xml +++ b/src/main/resources/mapper/LocDetlMapper.xml @@ -297,5 +297,9 @@ where 1=1 group by matnr,batch </select> + <select id="sum" resultType="java.lang.Integer"> + SELECT SUM(anfme) FROM asr_loc_detl + </select> + </mapper> diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js index eca2026..4add989 100644 --- a/src/main/webapp/static/js/locDetl/locDetl.js +++ b/src/main/webapp/static/js/locDetl/locDetl.js @@ -21,8 +21,8 @@ headers: {token: localStorage.getItem('token')}, url: baseUrl+'/locDetl/list/auth', page: true, - limit: 16, - limits: [16, 30, 50, 100, 200, 500], + limit: 20, + limits: [20, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js index aac1566..fd1da33 100644 --- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js +++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js @@ -24,8 +24,8 @@ headers: {token: localStorage.getItem('token')}, url: baseUrl+'/locDetl/statis/auth', page: true, - limit: 16, - limits: [16, 30, 50, 100, 200, 500], + limit: 20, + limits: [20, 30, 50, 100, 200, 500], even: true, toolbar: '#toolbar', cellMinWidth: 50, @@ -59,6 +59,19 @@ res.data[_index][data.value] = 'N'; } }); + /** + * 鏄剧ず搴撳瓨鎬绘暟閲� + */ + $.ajax({ + url: baseUrl+"/locDetl/count", + headers: {'token': localStorage.getItem('token')}, + contentType:'application/json;charset=UTF-8', + method: 'POST', + success: function (res) { + $("#countNum").text(res.data + '涓�'); + } + }); + } }); diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js index b4d33f4..a4630e5 100644 --- a/src/main/webapp/static/js/stoMan/stoQue.js +++ b/src/main/webapp/static/js/stoMan/stoQue.js @@ -19,8 +19,8 @@ headers: {token: localStorage.getItem('token')}, url: baseUrl+'/locMast/list/auth', page: true, - limit: 16, - limits: [16, 30, 50, 100, 200, 500], + limit: 20, + limits: [20, 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 d2e1786..d6d7c45 100644 --- a/src/main/webapp/views/locDetl/locDetl.html +++ b/src/main/webapp/views/locDetl/locDetl.html @@ -21,9 +21,15 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> + <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> <input class="layui-input" type="text" name="matnr" 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"> diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html index a7e0104..a312e9c 100644 --- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html +++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html @@ -21,8 +21,18 @@ </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> - <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button> + <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> + <div class="layui-inline"> + <fieldset class="layui-elem-field"> + <legend>鎬昏鏁伴噺</legend> + <div class="layui-field-box" id="countNum"> + 璇风◢绛� + </div> + </fieldset> </div> </div> @@ -31,7 +41,8 @@ <table class="layui-hide" id="locDetlStatis" lay-filter="locDetlStatis"></table> </div> <script type="text/html" id="toolbar"> - <div class="layui-btn-container"> + + <div class="layui-btn-container layui-col-md1"> <button class="layui-btn" lay-event="exportAll" style="margin-top: -0px">瀵煎嚭鍏ㄩ儴</button> </div> </script> diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html index 0b77d23..9e3ee3d 100644 --- a/src/main/webapp/views/report/locDetl.html +++ b/src/main/webapp/views/report/locDetl.html @@ -51,7 +51,7 @@ headers: {token: localStorage.getItem('token')}, url: baseUrl+'/locDetl/list/auth', page: true, - limit: 10, + limit: 20, skin: 'line', where: {loc_no: parent.locNo}, even: true, diff --git a/src/main/webapp/views/stoMan/stoQue.html b/src/main/webapp/views/stoMan/stoQue.html index 936047c..6201b1e 100644 --- a/src/main/webapp/views/stoMan/stoQue.html +++ b/src/main/webapp/views/stoMan/stoQue.html @@ -32,6 +32,11 @@ <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off"> </div> </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="barcode" placeholder="鎵樼洏鐮�" autocomplete="off"> + </div> + </div> <!-- 鏃ユ湡鑼冨洿 --> <div class="layui-inline" style="width: 300px"> <div class="layui-input-inline"> -- Gitblit v1.9.1