| src/main/java/com/zy/asrs/controller/MobileController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/pda/comb.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/pda/combPro.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/pda/index.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/pda/stockCheck.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/MobileController.java
@@ -15,6 +15,8 @@ import com.zy.asrs.service.WrkDetlService; import com.zy.common.model.MobileLocDetlVo; import com.zy.common.web.BaseController; import com.zy.ints.entity.WaitMatin; import com.zy.ints.service.WaitMatinService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -40,6 +42,8 @@ private LocDetlService locDetlService; @Autowired private WrkDetlService wrkDetlService; @Autowired private WaitMatinService waitMatinService; /** * 组托 @@ -160,4 +164,29 @@ } return R.parse(BaseRes.PARAM); } /** * 根据通知单查询明细 */ @RequestMapping("/bill/query/auth") @ManagerAuth(memo = "根据通知单查询明细") public R billQuery(@RequestParam String billNo){ List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo)); List<CombBillQueryVo> vos = new ArrayList<>(); if (!Cools.isEmpty(waitPakins)) { for (WaitMatin waitMatin : waitMatins) { CombBillQueryVo vo = new CombBillQueryVo(); vo.setMatNo(waitMatin.getMatnr()); vo.setMatName(waitMatin.getMaktx()); vo.setCount(waitMatin.getAnfme()); vo.setSupplier(waitMatin.getSupplier()); vo.setAltme(waitMatin.getAltme()); vo.setType(waitMatin.getType()); vo.setLgnum(waitMatin.getLgnum()); vo.setColor(waitMatin.getColor()); vos.add(vo); } } return R.ok().add(vos); } } src/main/webapp/views/pda/comb.html
@@ -19,7 +19,7 @@ <!-- 头部 --> <header> <div class="layui-input-inline"> <label class="layui-form-label">条码</label> <label class="layui-form-label">托盘码</label> <input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="扫码 / 输入" autocomplete="off"> </div> <div style="margin: 5px 5px"> src/main/webapp/views/pda/combPro.html
New file @@ -0,0 +1,450 @@ <!DOCTYPE html> <html lang="en"> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/> <title>组托</title> <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../../static/css/pda.css" media="all"> <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> <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script> <style> .number-tool { margin-left: 10px; padding: 1px 0 1px 5px; display: inline-block; width: 120px; } .number-tool:after { clear: both; content: ""; display: table; } .number-tool button { background-color: #fff; margin-top: 3px; font-size: 16px; height: 25px; float: left; width: 25px; border: 1px solid #777777; } .number-tool input { text-align: center; height: 30px; float: left; margin: 0 5px; width: 50px; padding: 0; } #confirm { margin: 10px 10px; padding: 5px 20px; font-weight: 600; } #remove { margin: 10px 10px; padding: 5px 20px; color: darkred; } .form-box span { font-size: 16px; display: inline-block; text-align: right; } .form-box input { width: 165px; padding-left: 5px; height: 30px; border: 1px solid #777777; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } </style> </head> <body> <!-- 头部 --> <header> <div class="layui-input-inline" style="margin-top: 5px"> <label class="layui-form-label" style="margin-left: 16px">单号</label> <input class="layui-input" id="billNo" oninput="find(this)" placeholder="扫码 / 输入" autocomplete="off" style="width: 175px; height: 40px; margin-right: 0;"> </div> <div class="layui-input-inline"> <label class="layui-form-label">托盘码</label> <input class="layui-input" style="width: 175px;" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="扫码 / 输入" autocomplete="off"> </div> </header> <!-- 主体 --> <main> <table class="layui-table" id="chooseData" lay-filter="chooseData"></table> </main> <!-- 尾部 --> <footer> <div class="layui-btn-container"> <!--<button type="button" id="test-btn" class="layui-btn layui-btn-primary" onclick="test()">测试入库</button>--> <!--<button type="button" id="test-btn2" class="layui-btn layui-btn-primary" onclick="test2()">测试出库</button>--> <button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">重置</button> <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">组托 </button> <span id="tips"></span> </div> </footer> <!-- 修改数量弹窗 --> <div id="modify" style="display: none; text-align: center;padding-top: 10px"> <div class="form-box"> <div class="form-item"> <table style="display: inline"> <tr> <td> <span style="width: 35px; margin-right: 5px">物料</span> </td> <td style="text-align: left"> <input id="matNo" type="text" disabled="disabled"> </td> </tr> </table> </div> <div class="form-item"> <table style="display: inline"> <tr> <td style="vertical-align: top"> <span style="width: 35px; margin-right: 5px">名称</span> </td> <td style="text-align: left"> <textarea rows="3" style="resize: none; width: 165px" id="matName" type="text" disabled="disabled" readonly="readonly"></textarea> </td> </tr> </table> </div> <div class="form-item"> <table style="display: inline"> <tr> <td> <span style="width: 35px; margin-right: 5px">单号</span> </td> <td style="text-align: left"> <input id="supplier" type="text" disabled="disabled"> </td> </tr> </table> </div> </div> <div class="form-item" style="margin-top: 5px"> <span style="vertical-align: middle">数量</span> <div class="number-tool" style="vertical-align: middle"> <button onclick="reduce()">-</button> <input id="count" type="number"> <button onclick="add()">+</button> </div> </div> <button id="remove" onclick="remove()">移除</button> <button id="confirm" onclick="confirm()">保存</button> </div> </body> <script> window.onload = function () { document.getElementById("billNo").focus(); } var tableIns; var countLayer; layui.use(['table', 'laydate', 'form'], function () { var table = layui.table; var $ = layui.jquery; var layer = layui.layer; var form = layui.form; tableIns = table.render({ elem: '#chooseData', data: [], width: 320, limit: 500, cellMinWidth: 50, cols: [[ { align: 'center', field: 'count', title: '数量', event: 'modify', style: 'cursor: pointer;color: blue', width: 70 }, {field: 'matNo', align: 'center', title: '产品编码', event: 'modify'}, {field: 'matName', align: 'center', title: '产品名称', event: 'modify'} // {field: 'color', align: 'center', title: '颜色', event: 'modify',} ]], done: function (res, curr, count) { } }); // 监听行工具事件 table.on('tool(chooseData)', function (obj) { var data = obj.data; switch (obj.event) { case 'modify': countLayer = layer.open({ type: 1, offset: '20px', title: '修改数量', shadeClose: true, area: ['80%', '300px'], content: $("#modify"), success: function (layero, index) { $('#matNo').val(data.matNo); $('#matName').val(data.matName); $('#count').val(data.count); maxCount = data.count; } }); break; } }); }); function findCode(el) { // if (el.value.length === 7) { // $('#code').focus(); // } } // 添加表格数据 var matData = []; function addTableData(data) { for (var i = 0; i < data.length; i++) { var toPush = true; for (var j = 0; j < matData.length; j++) { if (data[i].matNo === matData[j].matNo) { matData[j].count = Number(matData[j].count) + Number(data[i].count); toPush = false; } } if (toPush) { matData.push(data[i]); } } tableIns.reload({data: matData}); // $("#comb-btn").focus(); } /** * 根据通知单号查询物料详情 */ function find(el) { if (isEmpty(el.value)) { return; } var billNo = el.value; if (billNo.indexOf('=') > -1) { billNo = billNo.split(",")[0].split("=")[1]; } if (isEmpty(billNo)) { return; } // 赋值前清空表格 matData = []; tableIns.reload({data: matData}); $.ajax({ url: baseUrl + "/mobile/bill/query/auth", headers: {'token': localStorage.getItem('token')}, data: { billNo: billNo }, method: 'POST', success: function (res) { if (res.code === 200) { if (res.data != null) { addTableData(res.data); } } else if (res.code === 403) { top.location.href = baseUrl + "/pda"; } else { tips(res.msg, true) } } }); } /************************************* 数量 ****************************************/ var countDom = $('#count'); var minCount = 1; var maxCount = 1; function add() { if (countDom.val() >= maxCount) { return; } countDom.val(Number(countDom.val()) + 1); } function reduce() { if (countDom.val() <= minCount) { return; } countDom.val(countDom.val() - 1); } // 修改数量 function confirm() { var matNo = $('#matNo').val(); var count = $('#count').val(); // var supplier = $("#supplier").val() === '' ? null : $("#supplier").val(); for (var j = 0; j < matData.length; j++) { if (matNo === matData[j].matNo) { if (count > maxCount || count < minCount) { tips("数量不能超过范围", true); return; } matData[j].count = Number(count); } } tableIns.reload({data: matData}); layer.close(countLayer); tips("修改成功"); } // 移除物料 function remove() { var matNo = $('#matNo').val(); var supplier = $("#supplier").val() === '' ? null : $("#supplier").val(); for (var j = 0; j < matData.length; j++) { if (matNo === matData[j].matNo) { matData.splice(j, 1); } } tableIns.reload({data: matData}); layer.close(countLayer); tips("移除成功"); } // 重置 function reset() { $('#code').val(""); $('#billNo').val(""); matData = []; tableIns.reload({data: matData}); } function test() { $.ajax({ url: baseUrl+"/erp/update", headers: {'token': localStorage.getItem('token')}, contentType:'application/json;charset=UTF-8', method: 'POST', async: false, success: function (res) { if (res.code === 200) { layer.msg("测试功能成功"); } else if (res.code === 403) { top.location.href = baseUrl + "/pda"; } else { tips(res.msg, true) } } }); } function test() { $.ajax({ url: baseUrl+"/erp/outUpdate", headers: {'token': localStorage.getItem('token')}, contentType:'application/json;charset=UTF-8', method: 'POST', async: false, success: function (res) { if (res.code === 200) { layer.msg("测试功能成功"); } else if (res.code === 403) { top.location.href = baseUrl + "/pda"; } else { tips(res.msg, true) } } }); } // 组托 function comb() { var barcode = $('#code').val(); if (isEmpty(barcode)) { tips("托盘条码为空", true); // document.getElementById("code").focus(); return; } if (barcode.length !== 8) { tips("条码必须为8位", true); return; } if (matData.length === 0) { tips("请提取物料", true); return; } var billNo = $('#billNo').val(); $.ajax({ url: baseUrl + "/mobile/comb/auth", headers: {'token': localStorage.getItem('token')}, data: JSON.stringify({ barcode: barcode, combMats: matData, billNo: billNo, }), contentType: 'application/json;charset=UTF-8', method: 'POST', async: false, success: function (res) { if (res.code === 200) { reset(); tips("组托成功") } else if (res.code === 403) { top.location.href = baseUrl + "/pda"; } else { tips(res.msg, true) } } }); } /** * 提示信息 * @param msg 提示内容 * @param warn true：红色字体 */ function tips(msg, warn) { layer.msg(msg, {icon: warn ? 2 : 1}) } document.onkeyup = function (e) { if (window.event)//如果window.event对象存在，就以此事件对象为准 e = window.event; var key = e.charCode || e.keyCode; if (key === 115) { $("#comb-btn").focus(); comb(); } else if (key === 113) { $("#code").val(""); $("#code").focus(); } } </script> </html> src/main/webapp/views/pda/index.html
@@ -73,14 +73,16 @@ <!-- 导航栏 --> <ul class="nav"> <li><a id="comb" onclick="nav(this.id)" class="nav-select" href="#">组托</a></li> <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">入库</a></li> <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">出库</a></li> <li><a id="combPro" onclick="nav(this.id)" class="nav-select" href="#">入库单组托</a></li> <!-- 根据入库单组托 --> <li><a id="comb" onclick="nav(this.id)" class="nav-unselect" href="#">组托</a></li> <!-- 根据物料产品组托 --> <!-- <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">入库</a></li>--> <!-- <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">出库</a></li>--> <li><a id="stockCheck" onclick="nav(this.id)" class="nav-unselect" href="#">库存盘点</a></li> <li><a id="stockQuery" onclick="nav(this.id)" class="nav-unselect" href="#">库存查询</a></li> </ul> <!-- 主体内容 --> <iframe id="content" src="comb.html"></iframe> <iframe id="content" src="combPro.html"></iframe> </body> <script> src/main/webapp/views/pda/stockCheck.html
New file @@ -0,0 +1,473 @@ <!DOCTYPE html> <html lang="en"> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/> <title>盘点</title> <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../../static/css/pda.css" media="all"> <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> <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script> <style> .number-tool { margin-left: 10px; padding: 1px 0 1px 5px; display: inline-block; width: 120px; } .number-tool:after { clear: both; content: ""; display: table; } .number-tool button { background-color: #fff; margin-top: 3px; font-size: 16px; height: 25px; float: left; width: 25px; border: 1px solid #777777; } .number-tool input { text-align: center; height: 30px; float: left; margin: 0 5px; width: 50px; padding: 0; } #confirm { margin: 10px 10px; padding: 5px 20px; font-weight: 600; } #remove { margin: 10px 10px; padding: 5px 20px; color: darkred; } </style> </head> <body> <!-- 头部 --> <header class="layui-form"> <div class="layui-input-inline" style="margin-top: 0px"> <label class="layui-form-label">出库口</label> <div class="layui-input-inline" style="margin-left: 5px;width: 120px"> <select id="staNoSelect" lay-filter="changeDevNo"> <option value="">请选择</option> </select> </div> </div> <div style="margin: 5px 5px"> <button id="replenish-btn" type="button" class="layui-btn layui-btn-normal" onclick="replenish()"><i class="layui-icon">+</i>补充 </button> </div> </header> <!-- 主体 --> <main> <table class="layui-table" id="chooseData" lay-filter="chooseData"></table> </main> <!-- 尾部 --> <footer> <div class="layui-btn-container"> <button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">重置</button> <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="check()" style="margin-left: 20px">确认 </button> <span id="tips"></span> </div> </footer> <!-- 修改数量弹窗 --> <div id="modify" style="display: none; text-align: center;padding-top: 10px"> <div class="form-item"> <span>物料</span> <input id="matnr" type="text" disabled="disabled" style="width: 70%"> </div> <div class="form-item"> <span>名称</span> <input id="maktx" type="text" disabled="disabled" style="width: 70%"> </div> <div class="form-item"> <span>颜色</span> <input id="color" type="text" disabled="disabled" style="width: 70%"> </div> <div class="form-item" style="margin-top: 5px"> <span style="vertical-align: middle">数量</span> <div class="number-tool" style="vertical-align: middle"> <button onclick="reduce()">-</button> <input id="count" type="number"> <button onclick="add()">+</button> </div> </div> <button id="remove" onclick="remove()">移除</button> <button id="confirm" onclick="confirm()">保存</button> </div> </body> <script type="text/template" id="takeSiteSelectTemplate"> {{#each data}} <option value="{{this}}">{{this}}</option> {{/each}} </script> <script> var tableIns; var anfmeLayer; var souceData = []; layui.use(['table', 'laydate', 'form'], function () { var table = layui.table; var $ = layui.jquery; var layer = layui.layer; var form = layui.form; tableIns = table.render({ elem: '#chooseData', data: [], limit: 500, cellMinWidth: 50, cols: [[ { fixed: 'left', align: 'center', field: 'count', title: '数量', event: 'modify', style: 'font-weight: bold;', width: 50 }, // {field: 'matnr', align: 'center', title: '商品编号', event: 'modify'}, {field: 'maktx', align: 'center', title: '商品名称', event: 'modify'}, {field: 'color', align: 'center', title: '颜色', event: 'modify'} ]], done: function (res, curr, count) { } }); // 监听行工具事件 table.on('tool(chooseData)', function (obj) { var data = obj.data; switch (obj.event) { case 'modify': anfmeLayer = layer.open({ type: 1, offset: '20px', title: '修改数量', shadeClose: true, area: ['80%', '250px'], content: $("#modify"), success: function (layero, index) { $('#matnr').val(data.matnr); $('#maktx').val(data.maktx); $('#count').val(data.count); $('#color').val(data.color); } }); break; } }); // 获取出库口 getOutBound(); function getOutBound() { $.ajax({ url: baseUrl + "/available/take/check/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 + "/pda"; } else { layer.msg(res.msg) } } }) } form.on('select(changeDevNo)', function (data) { souceData = []; // 初始化表格数据记录 $.ajax({ url: baseUrl + "/erp/queryMatFromDevNo?devNo=" + data.value, headers: {'token': localStorage.getItem('token')}, contentType: 'application/json;charset=UTF-8', method: 'GET', async: false, success: function (res) { if (res.code === 200) { console.log('数据', res); locDetlData = res.data; if (res.data && res.data.length > 0) { res.data.map(function (item) { souceData.push(item); }); } tableIns.reload({data: locDetlData}); } else if (res.code === 403) { top.location.href = baseUrl + "/pda"; } else { tips(res.msg, true) } } }); }); }); /** * 根据通知单号查询物料详情 */ function find(el) { if (isEmpty(el.value)) { return; } $.ajax({ url: baseUrl + "/locDetl/queryDetl/auth", headers: {'token': localStorage.getItem('token')}, data: { uuid: el.value }, method: 'GET', success: function (res) { if (res.code === 200) { if (res.data != null) { locDetlData = []; initTableData(res.data); } } else if (res.code === 403) { top.location.href = baseUrl + "/pda"; } else { tips(res.msg, true) } } }) } // 添加表格数据 var locDetlData = []; function initTableData(data) { for (var i = 0; i < data.length; i++) { var toPush = true; for (var j = 0; j < locDetlData.length; j++) { if (data[i].matnr === locDetlData[j].matnr) { toPush = false; } } if (toPush) { locDetlData.push(data[i]); } } tableIns.reload({data: locDetlData}); } function addTableData(data) { if (isEmpty(data.matNo) || isEmpty(data.str8)) { tips("提取失败", true); return; } var toPush = true; for (var j = 0; j < locDetlData.length; j++) { if (data.matNo === locDetlData[j].matnr && data.str8 === locDetlData[j].color) { toPush = false; } } if (toPush) { var pushData = { locNo: locDetlData[0] ? locDetlData[0].locNo : null, matnr: data.matNo, count: data.count, maktx: data.matName, color: data.str8 } locDetlData.push(pushData); } tableIns.reload({data: locDetlData}); } /************************************* 数量 ****************************************/ var countDom = $('#count'); var minCount = 0; function add() { countDom.val(Number(countDom.val()) + 1); } function reduce() { if (countDom.val() <= minCount) { return; } countDom.val(countDom.val() - 1); } // 修改数量 function confirm() { var matnr = $('#matnr').val(); var count = $('#count').val(); for (var j = 0; j < locDetlData.length; j++) { if (matnr === locDetlData[j].matnr) { if (count < minCount) { tips("数量必须大于0", true); return; } locDetlData[j].count = Number(count); } } tableIns.reload({data: locDetlData}); layer.close(anfmeLayer); tips("修改成功"); } // 移除物料 function remove() { var matnr = $('#matnr').val(); var color = $('#color').val(); for (var j = 0; j < locDetlData.length; j++) { if (matnr === locDetlData[j].matnr && color === locDetlData[j].color) { locDetlData.splice(j, 1); } } tableIns.reload({data: locDetlData}); layer.close(anfmeLayer); tips("移除成功"); } /************************************* 补充 ****************************************/ var matCodeLayerIdx; function replenish() { matCodeLayerIdx = layer.open({ type: 2, title: '补充商品', shade: [0.3, '#000'], area: ['90%', '80%'], content: 'matQuery.html', success: function (layero, index) { $('.layui-layer-title').css('font-size', '16px'); $('.layui-layer.layui-layer-iframe').css('border-radius', '8px'); }, end: function () { // $('#mat-btn').focus(); } }); } // 重置 function reset() { // $('#locNo').val(""); $('#staNoSelect').val(""); layui.form.render('select'); locDetlData = []; tableIns.reload({data: locDetlData}); } // 确认 function check() { var staNoSelect = $("#staNoSelect").val(); if (staNoSelect === "") { layer.msg("请选择出库口"); return; } if (souceData.length === 0) { layer.msg("站点无货，无法盘点"); return; } if (locDetlData.length > 0) { for (var i = 0; i < locDetlData.length; i++) { if (locDetlData[i].count === null || locDetlData[i].count === 0 || locDetlData[i].count === undefined) { tips(locDetlData[i].matnr + "商品数量错误", true); return; } } } var checkList = []; if (locDetlData.length > 0) { locDetlData.map(function (item) { checkList.push({ locNo: item.locNo, matnr: item.matnr, count: item.count, color: item.color }); }); } var sourceList = []; if (souceData.length > 0) { souceData.map(function (item) { sourceList.push({ locNo: item.locNo, matnr: item.matnr, count: item.count, color: item.color }); }); } // 盘点接口 /work/stock/check $.ajax({ url: baseUrl+"/erp/stock/check", headers: {'token': localStorage.getItem('token')}, data: JSON.stringify({ checkList: checkList, sourceList: sourceList, }), contentType:'application/json;charset=UTF-8', method: 'POST', async: false, success: function (res) { if (res.code === 200) { reset(); layer.msg("盘点成功"); } else if (res.code === 403) { top.location.href = baseUrl + "/pda"; } else { tips(res.msg, true) } } }); } /** * 提示信息 * @param msg 提示内容 * @param warn true：红色字体 */ function tips(msg, warn) { layer.msg(msg, {icon: warn ? 2 : 1}) } document.onkeyup = function (e) { if (window.event)//如果window.event对象存在，就以此事件对象为准 e = window.event; var key = e.charCode || e.keyCode; if (key === 115) { // $("#comb-btn").focus(); comb(); } else if (key === 113) { // $("#locNo").val(""); // $("#locNo").focus(); } } </script> </html>
