From 1da595aa0da816fe33d0eed7fdab97fd8f38cc51 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期六, 20 五月 2023 09:08:14 +0800 Subject: [PATCH] 工作号变任务号等 --- src/main/webapp/views/basDevp/basDevp_detail.html | 26 ++++---- src/main/webapp/static/wms/js/basDevp/basDevp.js | 28 ++++---- src/main/webapp/views/wrkMast/wrkMast.html | 4 src/main/webapp/static/wms/js/wrkMast/wrkMast.js | 31 +++++----- src/main/webapp/static/wms/js/wrkMastLog/wrkMastLog.js | 10 +- src/main/webapp/views/wrkMastLog/wrkMastLog.html | 4 src/main/webapp/views/commandManage/commandManage.html | 2 src/main/webapp/views/wrkMastLog/wrkDetlLog.html | 8 +- src/main/webapp/static/wms/js/commandManage/commandManage.js | 2 src/main/java/com/zy/asrs/entity/WrkMast.java | 22 +++++++ src/main/webapp/static/wms/js/basCrnp/basCrnp.js | 6 +- 11 files changed, 83 insertions(+), 60 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java index e896efc..1078c51 100644 --- a/src/main/java/com/zy/asrs/entity/WrkMast.java +++ b/src/main/java/com/zy/asrs/entity/WrkMast.java @@ -484,4 +484,26 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime); } + /** + * 鑾峰彇鎸佺画鏃堕棿 + */ + public String getDurationTime() { + if (Cools.isEmpty(this.ioTime)) { + return ""; + } + + Date endDate = new Date(); + + //鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟 + long l = this.ioTime.getTime() - endDate.getTime(); + + //鍒嗗埆璁$畻鐩稿樊鐨勫ぉ銆佸皬鏃躲�佸垎銆佺 + long day = l / (24 * 60 * 60 * 1000); + long hour = (l / (60 * 60 * 1000) - day * 24); + long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60); + long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60); + + return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�"; + } + } diff --git a/src/main/webapp/static/wms/js/basCrnp/basCrnp.js b/src/main/webapp/static/wms/js/basCrnp/basCrnp.js index 555a2aa..23e05ce 100644 --- a/src/main/webapp/static/wms/js/basCrnp/basCrnp.js +++ b/src/main/webapp/static/wms/js/basCrnp/basCrnp.js @@ -33,10 +33,10 @@ return html; },width:80} ,{field: 'crnSts$', align: 'center',title: '鐘舵��'} - ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'} + ,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'} ,{field: 'crnErr$', align: 'center',title: '寮傚父鐮�'} - ,{field: 'frmLocno$', align: 'center',title: '婧愬簱浣�',sort: true} - ,{field: 'toLocno$', align: 'center',title: '鐩爣搴撲綅', sort: true} + ,{field: 'frmLocno$', align: 'center',title: '寮�濮嬬偣',sort: true} + ,{field: 'toLocno$', align: 'center',title: '鐩爣鐐�', sort: true} ,{field: 'frmSta$', align: 'center',title: '婧愮珯', sort: true} ,{field: 'toSta$', align: 'center',title: '鐩爣绔�', sort: true} // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer'} diff --git a/src/main/webapp/static/wms/js/basDevp/basDevp.js b/src/main/webapp/static/wms/js/basDevp/basDevp.js index 7fea76d..da7d7e5 100644 --- a/src/main/webapp/static/wms/js/basDevp/basDevp.js +++ b/src/main/webapp/static/wms/js/basDevp/basDevp.js @@ -63,21 +63,21 @@ // ,{field: 'rearing', align: 'center',title: ''} // ,{field: 'uping', align: 'center',title: ''} // ,{field: 'downing', align: 'center',title: ''} - ,{field: 'inreq1', align: 'center',title: '闇�姹�1', templet:function(row){ - var html = "<input value='inreq1' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'"; - if(row.inreq1 === 'Y'){html += " checked ";} - html += ">"; - return html; - }} - ,{field: 'inreq2', align: 'center',title: '闇�姹�2', templet:function(row){ - var html = "<input value='inreq2' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'"; - if(row.inreq2 === 'Y'){html += " checked ";} - html += ">"; - return html; - }} - ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�', edit:true, style:'color: blue;font-weight: bold'} + // ,{field: 'inreq1', align: 'center',title: '闇�姹�1', templet:function(row){ + // var html = "<input value='inreq1' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'"; + // if(row.inreq1 === 'Y'){html += " checked ";} + // html += ">"; + // return html; + // }} + // ,{field: 'inreq2', align: 'center',title: '闇�姹�2', templet:function(row){ + // var html = "<input value='inreq2' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'"; + // if(row.inreq2 === 'Y'){html += " checked ";} + // html += ">"; + // return html; + // }} + ,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�', edit:true, style:'color: blue;font-weight: bold'} // ,{field: 'wrkNo1', align: 'center',title: ''} - ,{field: 'locType1$', align: 'center',title: '妗剁被鍨�'} + ,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷'} // ,{field: 'barcode', align: 'center',title: '鏉″舰鐮�'} ,{field: 'inQty', align: 'center',title: '鍏ュ簱鏆傚瓨'} // ,{field: 'row1', align: 'center',title: ''} diff --git a/src/main/webapp/static/wms/js/commandManage/commandManage.js b/src/main/webapp/static/wms/js/commandManage/commandManage.js index fa66c05..65f2444 100644 --- a/src/main/webapp/static/wms/js/commandManage/commandManage.js +++ b/src/main/webapp/static/wms/js/commandManage/commandManage.js @@ -21,7 +21,7 @@ cellMinWidth: 50, cols: [[ {field: 'id', align: 'center',title: '鎸囦护缂栧彿',event: 'wrkNo', sort: true} - ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true} + ,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�',event: 'wrkNo', sort: true} ,{field: 'commandStatus$', align: 'center',title: '鎸囦护鐘舵��'} ,{field: 'durationTime', align: 'center',title: '鎸佺画鏃堕暱', width: 160} ,{field: 'commandType', align: 'center',title: '鎸囦护绫诲瀷'} diff --git a/src/main/webapp/static/wms/js/wrkMast/wrkMast.js b/src/main/webapp/static/wms/js/wrkMast/wrkMast.js index 7e4e1e6..700a342 100644 --- a/src/main/webapp/static/wms/js/wrkMast/wrkMast.js +++ b/src/main/webapp/static/wms/js/wrkMast/wrkMast.js @@ -26,16 +26,17 @@ cellMinWidth: 50, cols: [[ {type: 'checkbox'} - , {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�', sort: true, width: 85} - , {field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿', sort: true, width: 160} - , {field: 'wrkSts$', align: 'center', title: '宸ヤ綔鐘舵��'} + , {field: 'wrkNo', align: 'center', title: '浠诲姟鍙�', sort: true, width: 85} + , {field: 'ioTime$', align: 'center', title: '浠诲姟鏃堕棿', sort: true, width: 160} + , {field: 'durationTime', align: 'center', title: '鎸佺画鏃堕暱', width: 160} + , {field: 'wrkSts$', align: 'center', title: '浠诲姟鐘舵��'} , {field: 'ioType$', align: 'center', title: '鍏ュ嚭搴撶被鍨�'} , {field: 'ioPri', align: 'center', title: '浼樺厛绾�'} , {field: 'crnNo$', align: 'center', title: '鍫嗗灈鏈�'} , {field: 'sourceStaNo$', align: 'center', title: '婧愮珯'} , {field: 'staNo$', align: 'center', title: '鐩爣绔�'} - , {field: 'sourceLocNo$', align: 'center', title: '婧愬簱浣�'} - , {field: 'locNo$', align: 'center', title: '鐩爣搴撲綅'} + , {field: 'sourceLocNo$', align: 'center', title: '璧峰鐐�'} + , {field: 'locNo$', align: 'center', title: '鐩爣鐐�'} , {field: 'barcode', align: 'center', title: '鏉$爜'} , {field: 'preHave', align: 'center', title: '鍏堝叆鍝�', hide: true} , {field: 'takeNone', align: 'center', title: '绌烘搷浣�', hide: true} @@ -290,7 +291,7 @@ // 寮瑰眰鏄剧ず layer.open({ type: 2, - title: '宸ヤ綔妗f槑缁�', + title: '浠诲姟妗f槑缁�', maxmin: true, area: [top.detailWidth, top.detailHeight], shadeClose: true, @@ -301,7 +302,7 @@ break; // 瀹屾垚 case 'complete': - layer.confirm('纭瀹屾垚璇ョ瑪宸ヤ綔妗o紵', {title: '宸ヤ綔鍙凤細' + data.wrkNo, shadeClose: true}, function () { + layer.confirm('纭瀹屾垚璇ョ瑪浠诲姟妗o紵', {title: '浠诲姟鍙凤細' + data.wrkNo, shadeClose: true}, function () { http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 1}, function (res) { $(".layui-laypage-btn")[0].click(); layer.msg(data.wrkNo + res.msg); @@ -314,7 +315,7 @@ case 'cancel': if (data.pdcType === "Y") { layer.confirm('褰撳墠浠诲姟鍏宠仈ERP閿�鍞崟锛屽彇娑堝皢閲嶆柊鐢熸垚鍑哄簱浣滀笟锛屾槸鍚︾户缁紵', { - title: '宸ヤ綔鍙凤細' + data.wrkNo, + title: '浠诲姟鍙凤細' + data.wrkNo, shadeClose: true }, function () { http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 2}, function (res) { @@ -324,8 +325,8 @@ layer.closeAll(); }); } else { - layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗o紵', { - title: '宸ヤ綔鍙凤細' + data.wrkNo, + layer.confirm('纭鍙栨秷璇ョ瑪浠诲姟妗o紵', { + title: '浠诲姟鍙凤細' + data.wrkNo, shadeClose: true }, function () { http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 2}, function (res) { @@ -338,7 +339,7 @@ break; // 鎷f枡鍏ュ簱 case 'pick': - layer.confirm('鎷f枡鍏ュ簱璇ョ瑪宸ヤ綔妗o紵', {title: '宸ヤ綔鍙凤細' + data.wrkNo, shadeClose: true}, function () { + layer.confirm('鎷f枡鍏ュ簱璇ョ瑪浠诲姟妗o紵', {title: '浠诲姟鍙凤細' + data.wrkNo, shadeClose: true}, function () { http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 3}, function (res) { $(".layui-laypage-btn")[0].click(); layer.msg(data.wrkNo + res.msg); @@ -349,7 +350,7 @@ // 鍏堝叆鍝� case 'preHave': layer.confirm('浠诲姟鍙戠敓鍏堝叆鍝佸紓甯搞�傚闇�閲嶆柊鍏ュ簱锛岃纭繚璐х墿宸叉斁鑷冲爢鍨涙満鍑哄簱绔欙紒', { - title: '宸ヤ綔鍙凤細' + data.wrkNo, + title: '浠诲姟鍙凤細' + data.wrkNo, shadeClose: true }, function () { http.post(baseUrl + "/deal/preHave/start", {wrkNo: data.wrkNo}, function (res) { @@ -362,7 +363,7 @@ // 绌烘搷浣� case 'takeNone': layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', { - title: '宸ヤ綔鍙凤細' + data.wrkNo, + title: '浠诲姟鍙凤細' + data.wrkNo, shadeClose: true }, function () { }); @@ -611,8 +612,8 @@ cellMinWidth: 50, cols: [[ {type: 'checkbox'} - , {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�'} - , {field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿'} + , {field: 'wrkNo', align: 'center', title: '浠诲姟鍙�'} + , {field: 'ioTime$', align: 'center', title: '浠诲姟鏃堕棿'} , {field: 'matnr', align: 'center', title: '鐗╂枡'} , {field: 'lgnum', align: 'center', title: '浠撳簱鍙�'} , {field: 'tbnum', align: 'center', title: '杞偍璇锋眰缂栧彿'} diff --git a/src/main/webapp/static/wms/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/wms/js/wrkMastLog/wrkMastLog.js index e637bfa..703d501 100644 --- a/src/main/webapp/static/wms/js/wrkMastLog/wrkMastLog.js +++ b/src/main/webapp/static/wms/js/wrkMastLog/wrkMastLog.js @@ -23,16 +23,16 @@ // {type: 'checkbox'} // ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80} // ,{field: 'id', align: 'center',title: '缂栧彿'} - {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true} - ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width:160, sort: true} - ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width:160} + {field: 'wrkNo', align: 'center',title: '浠诲姟鍙�',event: 'wrkNo', sort: true} + ,{field: 'ioTime$', align: 'center',title: '浠诲姟鏃堕棿', width:160, sort: true} + ,{field: 'wrkSts$', align: 'center',title: '浠诲姟鐘舵��', width:160} ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width:160} ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'} ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈哄彿'} ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'} ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'} - ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'} - ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'} + ,{field: 'sourceLocNo$', align: 'center',title: '璧峰鐐�'} + ,{field: 'locNo$', align: 'center',title: '鐩爣鐐�'} // ,{field: 'picking', align: 'center',title: '鎷f枡', templet:function(row){ // var html = "<input value='picking' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'"; // if(row.picking === 'Y'){html += " checked ";} diff --git a/src/main/webapp/views/basDevp/basDevp_detail.html b/src/main/webapp/views/basDevp/basDevp_detail.html index 6d45a4d..d0cbfa3 100644 --- a/src/main/webapp/views/basDevp/basDevp_detail.html +++ b/src/main/webapp/views/basDevp/basDevp_detail.html @@ -96,20 +96,20 @@ <input id="downing" class="layui-input" type="text"> </div> </div> +<!-- <div class="layui-inline" style="width:31%;">--> +<!-- <label class="layui-form-label">闇� 姹� 1锛�</label>--> +<!-- <div class="layui-input-inline">--> +<!-- <input id="inreq1" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="layui-inline" style="width:31%;">--> +<!-- <label class="layui-form-label">闇� 姹� 2锛�</label>--> +<!-- <div class="layui-input-inline">--> +<!-- <input id="inreq2" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>--> +<!-- </div>--> +<!-- </div>--> <div class="layui-inline" style="width:31%;"> - <label class="layui-form-label">闇� 姹� 1锛�</label> - <div class="layui-input-inline"> - <input id="inreq1" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'> - </div> - </div> - <div class="layui-inline" style="width:31%;"> - <label class="layui-form-label">闇� 姹� 2锛�</label> - <div class="layui-input-inline"> - <input id="inreq2" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'> - </div> - </div> - <div class="layui-inline" style="width:31%;"> - <label class="layui-form-label">宸� 浣� 鍙凤細</label> + <label class="layui-form-label">浠� 鍔� 鍙凤細</label> <div class="layui-input-inline"> <input id="wrkNo" class="layui-input" type="text"> </div> diff --git a/src/main/webapp/views/commandManage/commandManage.html b/src/main/webapp/views/commandManage/commandManage.html index 6d50bc9..7f7fb10 100644 --- a/src/main/webapp/views/commandManage/commandManage.html +++ b/src/main/webapp/views/commandManage/commandManage.html @@ -20,7 +20,7 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> - <input class="layui-input" type="text" name="wrk_no" id="wrkNo" placeholder="宸ヤ綔鍙�" autocomplete="off"> + <input class="layui-input" type="text" name="wrk_no" id="wrkNo" placeholder="浠诲姟鍙�" autocomplete="off"> </div> </div> diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html index 2937015..6ee2ff6 100644 --- a/src/main/webapp/views/wrkMast/wrkMast.html +++ b/src/main/webapp/views/wrkMast/wrkMast.html @@ -54,13 +54,13 @@ <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="wrk_no" id="wrkNo" placeholder="宸ヤ綔鍙�" autocomplete="off"> + <input class="layui-input" type="text" name="wrk_no" id="wrkNo" placeholder="浠诲姟鍙�" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline cool-auto-complete"> <input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none"> - <input id="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="宸ヤ綔鐘舵��" onfocus=this.blur()> + <input id="wrkSts$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))"> <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> diff --git a/src/main/webapp/views/wrkMastLog/wrkDetlLog.html b/src/main/webapp/views/wrkMastLog/wrkDetlLog.html index acbb2b8..bfe52d4 100644 --- a/src/main/webapp/views/wrkMastLog/wrkDetlLog.html +++ b/src/main/webapp/views/wrkMastLog/wrkDetlLog.html @@ -14,13 +14,13 @@ </head> <body> <div class="layui-inline" style="width:20%;margin-top: 20px"> - <label class="layui-form-label">宸� 浣� 鍙凤細</label> + <label class="layui-form-label">浠� 鍔� 鍙凤細</label> <div class="layui-input-inline"> <input id="wrkNo" class="layui-input" type="text" disabled="disabled"> </div> </div> <div class="layui-inline" style="width:20%;margin-top: 20px"> - <label class="layui-form-label">宸ヤ綔鏃堕棿锛�</label> + <label class="layui-form-label">浠诲姟鏃堕棿锛�</label> <div class="layui-input-inline"> <input id="ioTime" class="layui-input" type="text" disabled="disabled"> </div> @@ -37,8 +37,8 @@ var pageCur; function getCol() { let cols = [ - {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'} - ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',width:160} + {field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'} + ,{field: 'ioTime$', align: 'center',title: '浠诲姟鏃堕棿',width:160} ]; cols.push.apply(cols, detlCols); return cols; diff --git a/src/main/webapp/views/wrkMastLog/wrkMastLog.html b/src/main/webapp/views/wrkMastLog/wrkMastLog.html index 8fe79b7..99b5828 100644 --- a/src/main/webapp/views/wrkMastLog/wrkMastLog.html +++ b/src/main/webapp/views/wrkMastLog/wrkMastLog.html @@ -15,13 +15,13 @@ <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="wrk_no" placeholder="宸ヤ綔鍙�" autocomplete="off"> + <input class="layui-input" type="text" name="wrk_no" placeholder="浠诲姟鍙�" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline cool-auto-complete"> <input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none"> - <input id="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="宸ヤ綔鐘舵��" onfocus=this.blur()> + <input id="wrkSts$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))"> <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> -- Gitblit v1.9.1