src/main/java/com/zy/asrs/controller/WorkController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/BasDevpService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/static/js/pakStore/stockOut.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/pakStore/stockOut.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/WorkController.java
@@ -37,6 +37,12 @@ return R.ok().add(basDevpService.getAvailableEmptyInSite()); } @RequestMapping("/available/take/site") @ManagerAuth(memo = "获取出库站点") public R availableTakeSite(){ return R.ok().add(basDevpService.getAvailableOutSite()); } @RequestMapping("/available/empty/take/site") @ManagerAuth(memo = "获取空板出库站点") public R availableEmptyTakeSite(){ src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -20,6 +20,12 @@ List<Integer> getAvailableEmptyInSite(); /** * 出库站 * @return */ List<Integer> getAvailableOutSite(); /** * 空板出库站 * @return */ src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -28,6 +28,11 @@ } @Override public List<Integer> getAvailableOutSite() { return this.baseMapper.getAvailableOutSite(101); } @Override public List<Integer> getAvailableEmptyOutSite() { return this.baseMapper.getAvailableOutSite(110); } src/main/webapp/static/js/pakStore/stockOut.js
@@ -6,4 +6,155 @@ var layDate = layui.laydate; var form = layui.form; // 数据渲染 tableIns = table.render({ elem: '#stockOut', headers: {token: localStorage.getItem('token')}, url: baseUrl+'/locDetl/list/auth', page: true, limit: 10, skin: 'line', even: true, toolbar: '#toolbar', cellMinWidth: 50, cols: [[ {type: 'checkbox'} ,{field: 'locNo$', align: 'center',title: '库位号'} ,{field: 'matnr', align: 'center',title: '物料'} ,{field: 'lgnum', align: 'center',title: '仓库号', width:80} ,{field: 'tbnum', align: 'center',title: '转储请求编号'} // ,{field: 'tbpos', align: 'center',title: '行项目'} ,{field: 'zmatid', align: 'center',title: '物料标签ID', width:200} ,{field: 'maktx', align: 'center',title: '物料描述', width:150} ,{field: 'werks', align: 'center',title: '工厂'} ,{field: 'anfme', align: 'center',title: '数量', width:80} ,{field: 'altme', align: 'center',title: '单位', width:80} ,{field: 'zpallet', align: 'center',title: '托盘条码'} ,{field: 'bname', align: 'center',title: '用户ID'} // ,{field: 'memo', align: 'center',title: '备注'} ]], request: { pageName: 'curr', pageSize: 'limit' }, parseData: function (res) { return { 'code': res.code, 'msg': res.msg, 'count': res.data.total, 'data': res.data.records } }, response: { statusCode: 200 }, done: function(res, curr, count) { 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'; } }); getOutBound(); } }); // 监听排序事件 table.on('sort(locDetl)', function (obj) { var searchData = {}; $.each($('#search-box [name]').serializeArray(), function() { searchData[this.name] = this.value; }); searchData['orderByField'] = obj.field; searchData['orderByType'] = obj.type; tableIns.reload({ where: searchData, page: { curr: 1 }, done: function (res, curr, count) { if (res.code === 403) { top.location.href = baseUrl+"/"; } pageCurr=curr; limit(); } }); }); // 搜索栏搜索事件 form.on('submit(search)', function (data) { pageCurr = 1; tableReload(); getOutBound(); }); // 搜索栏重置事件 form.on('submit(reset)', function (data) { pageCurr = 1; clearFormVal($('#search-box')); tableReload(); getOutBound(); }); // 获取出库口 function getOutBound(){ $.ajax({ url: baseUrl+"/available/take/site", headers: {'token': localStorage.getItem('token')}, method: 'POST', async: false, success: function (res) { if (res.code === 200){ var tpl = $("#takeSiteSelectTemplate").html(); var template = Handlebars.compile(tpl); var html = template(res); $('#staNoSelect').append(html); form.render('select'); } else if (res.code === 403){ top.location.href = baseUrl+"/"; }else { layer.msg(res.msg) } } }) } }) function tableReload(child) { var searchData = {}; $.each($('#search-box [name]').serializeArray(), function() { searchData[this.name] = this.value; }); (child ? parent.tableIns : tableIns).reload({ where: searchData, page: { curr: pageCurr }, done: function (res, curr, count) { if (res.code === 403) { top.location.href = baseUrl+"/"; } pageCurr=curr; if (res.data.length === 0 && count !== 0) { tableIns.reload({ where: searchData, page: { curr: pageCurr-1 } }); pageCurr -= 1; } limit(child); } }); } src/main/webapp/views/pakStore/stockOut.html
@@ -10,12 +10,108 @@ <link rel="stylesheet" href="../../static/css/cool.css" media="all"> <link rel="stylesheet" href="../../static/css/common.css" media="all"> <style> html { height: 100%; padding: 10px; background-color: #f1f1f1; } body { background-color: #fff; border-radius: 5px; box-shadow: 0 0 3px rgba(0,0,0,.3); padding-bottom: 20px; } #search-box { padding: 30px 0 20px 0; } #search-box .layui-inline:first-child { margin-left: 30px; } #search-box .layui-inline { margin-right: 5px; } #data-search-btn { margin-left: 10px; display: inline-block; } #data-search-btn.layui-btn-container .layui-btn { margin-right: 20px; } #staNoSpan { text-align: center; display: inline-block; width: 100px; font-size: 13px; } .layui-btn-container .layui-form-select { display: inline-block; width: 150px; height: 30px; } .layui-btn-container .layui-form-select.layui-form-selected { display: inline-block; width: 150px; } .layui-btn-container .layui-select-title input { font-size: 13px; } .layui-btn-container .layui-anim.layui-anim-upbit dd { font-size: 13px; } #btn-outbound { margin-left: 60px; display: none; } </style> </head> <body> <h1>hello</h1> <!-- 搜索栏 --> <!-- 搜索栏 --> <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="loc_no" placeholder="库位号" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="mat_no" placeholder="箱号/批号" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="mat_name" 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> <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button> </div> </div> <script type="text/html" id="toolbar"> <div class="layui-form"> <div class="layui-btn-container"> <!-- 1.选择出库口 --> <span id="staNoSpan">出库口:</span> <select id="staNoSelect" lay-verify="required"> <option value="">请选择站点</option> </select> <!-- 2.启动出库 --> <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">启动出库</button> </div> </div> </script> <table class="layui-hide" id="stockOut" lay-filter="stockOut"></table> <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> @@ -25,7 +121,7 @@ <script type="text/javascript" src="../../static/js/pakStore/stockOut.js" charset="utf-8"></script> <script type="text/template" id="outSiteTemplate"> <script type="text/template" id="takeSiteSelectTemplate"> {{#each data}} <option value="{{this}}">{{this}}</option> {{/each}}