From 15c1245e328a589fe1998e1c40119821c0c6eb28 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 10 三月 2021 12:42:21 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/ioWorks/stockOut.js | 180 ++++++++++++++++ src/main/webapp/views/ioWorks/locDetlQuery.html | 257 +++++++++++++++++++++++ src/main/webapp/views/ioWorks/stockOut.html | 129 +++++++++++ src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java | 17 + src/main/webapp/static/js/common.js | 61 +++++ 5 files changed, 644 insertions(+), 0 deletions(-) diff --git a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java index be082ee..b9ddade 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java @@ -52,6 +52,23 @@ ); } +// @RequestMapping(value = "/stock/out/list/auth") +// @ManagerAuth +// public R stockOutList(@RequestParam(defaultValue = "1")Integer curr, +// @RequestParam(defaultValue = "10")Integer limit, +// @RequestParam Map<String, Object> param){ +// if (!Cools.isEmpty(param.get("update_time"))){ +// String val = String.valueOf(param.get("update_time")); +// if (val.contains(RANGE_TIME_LINK)) { +// String[] dates = val.split(RANGE_TIME_LINK); +// param.put("startTime", DateUtils.convert(dates[0])); +// param.put("endTime", DateUtils.convert(dates[1])); +// param.remove("modi_time"); +// } +// } +// return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class))); +// } + private void convert(Map<String, Object> map, EntityWrapper wrapper){ for (Map.Entry<String, Object> entry : map.entrySet()){ String val = String.valueOf(entry.getValue()); diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index 04d0379..3cefd3b 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -153,3 +153,64 @@ return http }) : "object" == typeof module && module.exports ? module.exports = http : n.http = http }(this); + + +function arrRemove(arr, key, val) { + for(var i=arr.length-1; i>=0; i--){ + if(arr[i][key] === val){ + arr.splice(i,1); + } + } +} + +var matCols = [ + {field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'} + ,{field: 'barcode', align: 'center',title: '鏉″舰鐮�', hide: true} + ,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О', width: 500} + ,{field: 'str2', align: 'center',title: '鐗╂枡绫诲埆'} + ,{field: 'str3', align: 'center',title: '瑙勬牸鍨嬪彿'} + ,{field: 'str1', align: 'center',title: '鍩烘湰鍗曚綅', hide: true} + ,{field: 'str4', align: 'center',title: '鐘舵��', hide: true} + ,{field: 'str5', align: 'center',title: '鍗曟嵁缂栧彿', hide: true} + ,{field: 'str6', align: 'center',title: '閫氱煡鍗曞彿', hide: true} + ,{field: 'str7', align: 'center',title: '榛樿浠撳簱', hide: true} + // ,{field: 'str8', align: 'center',title: '鍝佺墝'} + // ,{field: 'str9', align: 'center',title: '閲囪喘鍛�'} + // ,{field: 'str10', align: 'center',title: '浜у湴'} + // ,{field: 'str11', align: 'center',title: '搴忓垪鍙风鐞�'} + // ,{field: 'str12', align: 'center',title: '鎵规绠$悊'} + // ,{field: 'str13', align: 'center',title: '淇濊川鏈熷崟浣�'} + // ,{field: 'str14', align: 'center',title: '淇濊川鏈熺鐞�'} + // ,{field: 'str15', align: 'center',title: '淇濊川鏈�'} + // ,{field: 'str16', align: 'center',title: '鍙攢鍞�'} + ,{field: 'str17', align: 'center',title: '鍙噰璐�', hide: true} + ,{field: 'str18', align: 'center',title: '鍙负瀛愪欢', hide: true} + // ,{field: 'str19', align: 'center',title: '鍙负缁勪欢'} + // ,{field: 'str20', align: 'center',title: '杈呭姪灞炴�х鐞�'} + ,{field: 'str21', align: 'center',title: '鎴愭湰璁$畻鏂规硶', hide: true} + ,{field: 'str22', align: 'center',title: '閲囪喘鍗曚綅', hide: true} + ,{field: 'str23', align: 'center',title: '閿�鍞崟浣�', hide: true} + // ,{field: 'num1', align: 'center',title: '棰勮澶╂暟'} + // ,{field: 'num2', align: 'center',title: '鏈�浣庡簱瀛樻暟閲�'} + // ,{field: 'num3', align: 'center',title: '鏈�楂樺簱瀛樻暟閲�'} + // ,{field: 'num4', align: 'center',title: '瀹夊叏搴撳瓨'} + // ,{field: 'num5', align: 'center',title: '绋庣巼'} +] + +var detlCols = [ + {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'} + ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'} + ,{field: 'name', align: 'center',title: '鍚嶇О'} + ,{field: 'specs', align: 'center',title: '瑙勬牸'} + ,{field: 'model', align: 'center',title: '鍨嬪彿', hide: true} + ,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true} + ,{field: 'unit', align: 'center',title: '鍗曚綅'} + ,{field: 'barcode', align: 'center',title: '璐х墿鏉$爜', hide: true} + ,{field: 'docId', align: 'center',title: '鍗曟嵁绫诲瀷', hide: true} + ,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿', hide: true} + ,{field: 'custName', align: 'center',title: '瀹㈡埛鍚嶇О', hide: true} + ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true} + ,{field: 'count', align: 'center',title: '鏁伴噺'} + ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: true} + ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'} +] diff --git a/src/main/webapp/static/js/ioWorks/stockOut.js b/src/main/webapp/static/js/ioWorks/stockOut.js new file mode 100644 index 0000000..5946e13 --- /dev/null +++ b/src/main/webapp/static/js/ioWorks/stockOut.js @@ -0,0 +1,180 @@ + +var locDetlData = []; +function getCol() { + var cols = [ + // {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'} + {field: 'anfme', align: 'center',title: '鏁伴噺'} + ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'} + ]; + arrRemove(detlCols, 'field', 'anfme'); + cols.push.apply(cols, detlCols); + // cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80}) + return cols; +} + +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', + headers: {token: localStorage.getItem('token')}, + data: [], + even: true, + toolbar: '#toolbar', + cellMinWidth: 50, + cols: [getCol()], + done: function(res, curr, count) { + limit(); + getOutBound(); + } + }); + + // 椤甸潰淇敼 + table.on('edit(chooseData)', function (obj) { + updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value)); + }); + + // 鐩戝惉澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(chooseData)', function (obj) { + var data = locDetlData; + switch (obj.event) { + case 'outbound': + if (data.length === 0){ + layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡'); + } else { + var staNo = $("#staNoSelect").val(); + if (staNo === "" || staNo === null){ + layer.msg("璇烽�夋嫨鍑哄簱鍙�"); + return; + } + var locDetls = []; + data.forEach(function(elem) { + locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count}); + }); + let param = { + outSite: staNo, + locDetls: locDetls + } + $.ajax({ + url: baseUrl+"/plate/out/start", + headers: {'token': localStorage.getItem('token')}, + data: JSON.stringify(param), + contentType:'application/json;charset=UTF-8', + method: 'POST', + success: function (res) { + if (res.code === 200){ + locDetlData = []; + tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}}); + layer.msg(res.msg); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg) + } + } + }); + } + break; + } + }); + + // 鐩戝惉琛屽伐鍏蜂簨浠� + table.on('tool(chooseData)', function(obj){ + var data = obj.data; + switch (obj.event) { + case 'remove': + for (var i = locDetlData.length - 1; i >= 0; i--) { + if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) { + locDetlData.splice(i, 1); + } + } + tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}}); + break; + } + }); + + function updateLocDetlData(locNo, matnr, count) { + if (isNaN(count)) { + layer.msg("璇疯緭鍏ユ暟瀛�"); + } else { + if (count > 0) { + for (var i=0;i<locDetlData.length;i++){ + if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){ + if (count > locDetlData[i]["anfme"]) { + layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�"); + } else { + locDetlData[i]["count"] = count; + } + break; + } + } + } else { + layer.msg("鏁伴噺蹇呴』澶т簬闆�"); + } + } + tableIns.reload({data: locDetlData,done:function (res) {limit(); 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) + } + } + }) + } +}) + +// 鎻愬彇鐗╂枡 +var locDetlLayerIdx; +function getLocDetl() { + locDetlLayerIdx = layer.open({ + type: 2, + title: '鎻愬彇鍑鸿揣鍐呭', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: true, + content: 'locDetlQuery.html', + success: function(layero, index){ + } + }); +} + +// 娣诲姞琛ㄦ牸鏁版嵁 +function addTableData(data) { + for (var i=0;i<data.length;i++){ + let pass = false; + for (var j=0;j<locDetlData.length;j++){ + if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) { + pass = true; + break; + } + } + if (pass) { + data.splice(i--, 1); + } else { + data[i]["count"] = data[i]["anfme"]; + } + + } + locDetlData.push.apply(locDetlData, data); + tableIns.reload({data: locDetlData}); + layer.close(locDetlLayerIdx); +} \ No newline at end of file diff --git a/src/main/webapp/views/ioWorks/locDetlQuery.html b/src/main/webapp/views/ioWorks/locDetlQuery.html new file mode 100644 index 0000000..44fe0ca --- /dev/null +++ b/src/main/webapp/views/ioWorks/locDetlQuery.html @@ -0,0 +1,257 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title></title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../static/css/cool.css" media="all"> + <link rel="stylesheet" href="../../static/css/common.css" media="all"> + <style> + body { + padding: 0 20px; + } + .layui-table-box { + border-right: 1px solid #9F9F9F; + border-left: 1px solid #9F9F9F; + } + + #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; + } + </style> +</head> +<body> + +<!-- 鎼滅储鏍� --> +<fieldset class="layui-elem-field site-demo-button" style="margin: 20px;"> + <legend>鎼滅储鏍�</legend> + <!-- 鎼滅储鏍� --> + <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="matnr" placeholder="鐗╂枡鍙�" autocomplete="off"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鍚嶇О" autocomplete="off"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="type" placeholder="鐗╂枡绫诲埆" autocomplete="off"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="lgnum" placeholder="瑙勬牸" autocomplete="off"> + </div> + </div> + <!-- 鏃ユ湡鑼冨洿 --> + <div class="layui-inline" style="width: 300px"> + <div class="layui-input-inline"> + <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px"> + </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> +</fieldset> + +<script type="text/html" id="toolbar"> + <div class="layui-btn-container"> + <button class="layui-btn" id="btn-confirm" lay-event="confirm" style="">鎻愬彇</button> + </div> +</script> + +<div class="layui-form"> + <table class="layui-hide" id="stockOut" lay-filter="stockOut"></table> +</div> + +<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> + +</body> +<script> + + var pageCurr; + function getCol() { + var cols = [ + {type: 'checkbox'} + ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'} + ]; + cols.push.apply(cols, detlCols); + cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true} + ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}) + return cols; + } + + layui.use(['table','laydate', 'form'], function() { + var table = layui.table; + var $ = layui.jquery; + var layer = layui.layer; + var layDate = layui.laydate; + var form = layui.form; + // 鏁版嵁娓叉煋 + locDetlTableIns = table.render({ + elem: '#stockOut', + headers: {token: localStorage.getItem('token')}, + url: baseUrl+'/stock/out/list/auth', + page: true, + limit: 10, + even: true, + toolbar: '#toolbar', + cellMinWidth: 50, + cols: [getCol()], + 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; + $('.layui-form-checkbox').css("pointer-events", "none"); + $('td[data-field="0').css("cursor", "pointer") + } + }); + + // 鐩戝惉澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(stockOut)', function (obj) { + var checkStatus = table.checkStatus(obj.config.id); + var data = checkStatus.data; + switch(obj.event) { + case 'confirm': + if (data.length === 0){ + layer.msg("璇烽�夋嫨鏁版嵁"); + return; + } + var locNos = []; + data.forEach(function(elem) { + locNos.push(elem.locNo); + }); + $.ajax({ + url: baseUrl+"/locDetl/auth", + headers: {'token': localStorage.getItem('token')}, + data: {locNos:locNos}, + method: 'POST', + async: false, + success: function (res) { + if (res.code === 200) { + data = res.data; + } else if (res.code === 403) { + top.location.href = baseUrl + "/"; + } else { + layer.msg(res.msg) + } + } + }) + parent.addTableData(data); + break; + } + }); + + // 鎼滅储鏍忔悳绱簨浠� + form.on('submit(search)', function (data) { + pageCurr = 1; + tableReload(); + }); + + // 鎼滅储鏍忛噸缃簨浠� + form.on('submit(reset)', function (data) { + pageCurr = 1; + clearFormVal($('#search-box')); + tableReload(); + }); + + layDate.render({ + elem: '.layui-laydate-range' + ,type: 'datetime' + ,range: true + }); + }) + + var b = true; + $(function(){ + $(document.body).on('click','td[data-field="0"]',function(){ + var locNo = $(this).next().children("div").html(); + if (b) { + b = false; + $("tr td[data-field=locNo\\$] div:contains("+ locNo +")").parent().prev().children().children("div").click(); + setTimeout(function () { + b = true; + }, 200) + } + }); + }) + + function tableReload(child) { + var searchData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + searchData[this.name] = this.value; + }); + locDetlTableIns.reload({ + where: searchData, + page: { + curr: pageCurr + }, + done: function (res, curr, count) { + if (res.code === 403) { + top.location.href = baseUrl+"/"; + } + pageCurr=curr; + $('.layui-form-checkbox').css("pointer-events", "none"); + $('td[data-field="0').css("cursor", "pointer") + } + }); + } + + function clearFormVal(el) { + $(':input', el) + .val('') + .removeAttr('checked') + .removeAttr('selected'); + } +</script> +</html> + diff --git a/src/main/webapp/views/ioWorks/stockOut.html b/src/main/webapp/views/ioWorks/stockOut.html new file mode 100644 index 0000000..3b052d7 --- /dev/null +++ b/src/main/webapp/views/ioWorks/stockOut.html @@ -0,0 +1,129 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title></title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> + <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; + } + + #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; + } + + /*----------------------------------*/ + .function-area { + padding: 20px 50px; + } + .function-btn { + font-size: 16px; + padding: 1px 1px 1px 1px; + width: 100px; + height: 50px; + border-color: #2b425b; + border-radius: 4px; + border-width: 2px; + background: none; + border-style: solid; + transition: 0.4s; + cursor: pointer; + letter-spacing: 3px; + } + .function-btn:hover { + background-color: #2b425b; + color: #fff; + } + + #mat-query { + display: none; + } + </style> +</head> +<body> + +<!-- 鍔熻兘鍖� --> +<div class="function-area"> + <button id="mat-query" class="function-btn" onclick="getLocDetl()">鏂板</button> +</div> + +<hr> + +<!-- 琛ㄦ牸 --> +<div style="padding-bottom: 5px; margin-bottom: 45px"> + + <!-- 澶撮儴 --> + <script type="text/html" id="toolbar"> + <div class="layui-form"> + <div class="layui-btn-container"> + <!-- 1.閫夋嫨鍑哄簱鍙� --> + <span id="staNoSpan">鍑哄簱鍙o細</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> + + <!-- 琛� --> + <script type="text/html" id="operate"> + <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a> + </script> + + <table class="layui-table" id="chooseData" lay-filter="chooseData"></table> +</div> + +<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> +<script type="text/javascript" src="../../static/js/ioWorks/stockOut.js" charset="utf-8"></script> + +<script type="text/template" id="takeSiteSelectTemplate"> + {{#each data}} + <option value="{{siteId}}">{{desc}}</option> + {{/each}} +</script> +</body> +</html> + -- Gitblit v1.9.1