From 45dd167e12e11af8dc7929ff1475623c80fc3578 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期三, 30 十月 2024 13:59:33 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OrderController.java | 10 src/main/java/com/zy/asrs/controller/AgvLocDetlController.java | 14 src/main/webapp/views/agvWrkMastLog/wrkMastLogWithWrktype.html | 98 ++++++++ src/main/webapp/static/js/agvWrkMastLog/wrkMastLogWithWrktype.js | 496 +++++++++++++++++++++++++++++++++++++++++++++ src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 19 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 6 6 files changed, 623 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java index 1b46653..9f6d390 100644 --- a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java @@ -130,12 +130,18 @@ .eq("three_code", record.getThreeCode()) .eq("matnr", record.getMatnr()) .in("source",docIds)); - if (orderDetl.getAnfme() - orderDetl.getQty() > 0) { - record.setStock(orderDetl.getAnfme() - orderDetl.getQty()); +// if (orderDetl.getAnfme() - orderDetl.getQty() > 0) { +// record.setStock(orderDetl.getAnfme() - orderDetl.getQty()); +// } else { +// record.setStock(-1D); +// } + if (Cools.isEmpty(orderDetl)) { + record.setStock(0D); } else { - record.setStock(-1D); + record.setStock(orderDetl.getAnfme() - orderDetl.getQty()); + record.setOrderNo(orderDetl.getOrderNo()); } - record.setOrderNo(orderDetl.getOrderNo()); + } return R.ok(agvLocDetlPage); } diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index bd12fb7..f73de83 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -956,15 +956,15 @@ Integer proSts = 0; Row row = sheet.getRow(i); //鍗曟嵁绫诲瀷 - String docName = dataFormatter.formatCellValue(row.getCell(0)); + String docName = dataFormatter.formatCellValue(row.getCell(0)).trim(); //鍗曟嵁缂栧彿 - String uuid = dataFormatter.formatCellValue(row.getCell(1)); + String uuid = dataFormatter.formatCellValue(row.getCell(1)).trim(); //鐗╂枡鍙� - String matnr = dataFormatter.formatCellValue(row.getCell(2)); + String matnr = dataFormatter.formatCellValue(row.getCell(2)).trim(); //閿�鍞崟鍙� - String csocode = dataFormatter.formatCellValue(row.getCell(3)); + String csocode = dataFormatter.formatCellValue(row.getCell(3)).trim(); //鑷敱椤� - String isocode = dataFormatter.formatCellValue(row.getCell(4)); + String isocode = dataFormatter.formatCellValue(row.getCell(4)).trim(); // 鏁伴噺 if(Cools.isEmpty(dataFormatter.formatCellValue(row.getCell(5)))){ continue; diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java index 1dd5e23..1cb8241 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java @@ -165,23 +165,22 @@ } } // 纭鏄惁鍏ㄩ儴鍑哄簱 - int sameNumber = 0; + double totleWrkdetl = 0.0; + double totleLocdetl = 0.0; List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", pickParams.getWrkNo())); for (AgvLocDetl agvLocDetl : agvLocDetls) { - for (AgvWrkDetl agvWrkDetl : agvWrkDetls) { - if (agvLocDetl.getMatnr().equals(agvWrkDetl.getMatnr()) - && agvLocDetl.getThreeCode().equals(agvWrkDetl.getThreeCode()) - && agvLocDetl.getSuppCode().equals(agvWrkDetl.getSuppCode()) - && agvLocDetl.getAnfme().equals(agvWrkDetl.getAnfme())) { - sameNumber++; - } - } + totleLocdetl = totleLocdetl + agvLocDetl.getAnfme(); } - if (agvLocDetls.size() == sameNumber || agvLocDetls.size() == 1) { + for (AgvWrkDetl agvWrkDetl : agvWrkDetls) { + totleWrkdetl = totleWrkdetl + agvWrkDetl.getAnfme(); + } + if (totleWrkdetl >= totleLocdetl) { agvWrkMast.setIoType(101); agvWrkMast.setModiTime(new Date()); agvWrkMastService.update(agvWrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", pickParams.getWrkNo())); + } +// agvLocDetls.size() == 1 return "缁勬墭鎴愬姛锛岀粦瀹氱珯鐐规垚鍔�"; diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java index 5098403..b15cc4f 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -353,12 +353,16 @@ String locNo = agvWrkMast.getLocNo(); agvWrkMast.setLocNo(agvWrkMast.getSourceLocNo()); agvWrkMast.setSourceLocNo(locNo); - agvWrkMast.setModiTime(new Date()); + agvWrkMast.setModiTime(now); agvWrkMast.setIoTime(now); agvWrkMast.setLogErrMemo("createWaitPainWrkMastStart"); agvWrkMastService.updateById(agvWrkMast); List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo())); + for (AgvWrkDetl agvWrkDetl : agvWrkDetlList) { + agvWrkDetl.setIoTime(now); + agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo())); + } AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo()); //List<AgvLocDetl> agvLocDetlList = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvLocMast.getLocNo())); AgvBasDevp agvBasDevp = agvBasDevpService.selectById(agvWrkMast.getSourceLocNo()); diff --git a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLogWithWrktype.js b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLogWithWrktype.js new file mode 100644 index 0000000..7e1ec4d --- /dev/null +++ b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLogWithWrktype.js @@ -0,0 +1,496 @@ +var pageCurr; +var wrkNo; +var ioTime; +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; + + // 鏁版嵁娓叉煋 + tableIns = table.render({ + elem: '#wrkMastLog', + headers: {token: localStorage.getItem('token')}, + url: baseUrl+'/agv/wrkMastLog/list/auth', + page: true, + limit: 16, + limits: [16, 30, 50, 100, 200, 500], + even: true, + toolbar: '#toolbar', + cellMinWidth: 50, + cols: [[ + {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true} + ,{field: 'modiTime$', 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: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'} + ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'} + ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true} + ,{field: 'appeTime$', align: 'center',title: '寮�濮嬫椂闂�', hide:false} + ,{field: 'barcode', align: 'center',title: '璐ф灦鐮�'} + ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80} + ]], + 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'; + } + }); + } + }); + + // 鐩戝惉鎺掑簭浜嬩欢 + table.on('sort(wrkMastLog)', 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(); + } + }); + }); + + // 鐩戝惉澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(wrkMastLog)', function (obj) { + var checkStatus = table.checkStatus(obj.config.id); + switch(obj.event) { + case 'addData': + layer.open({ + type: 2, + title: '鏂板', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: false, + content: 'wrkMastLog_detail.html', + success: function(layero, index){ + layer.getChildFrame('#data-detail-submit-edit', index).hide(); + clearFormVal(layer.getChildFrame('#detail', index)); + layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"}); + } + }); + break; + case 'refreshData': + tableIns.reload({ + page: { + curr: pageCurr + } + }); + limit(); + break; + case 'deleteData': + var data = checkStatus.data; + if (data.length === 0){ + layer.msg('璇烽�夋嫨鏁版嵁'); + } else { + layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){ + $.ajax({ + url: baseUrl+"/agv/wrkMastLog/delete/auth", + headers: {'token': localStorage.getItem('token')}, + data: {param: JSON.stringify(data)}, + method: 'POST', + traditional:true, + success: function (res) { + if (res.code === 200){ + layer.closeAll(); + tableReload(false); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg) + } + } + }) + }); + } + break; + case 'exportData': + layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){ + var titles=[]; + var fields=[]; + obj.config.cols[0].map(function (col) { + if (col.type === 'normal' && col.hide === false && col.toolbar == null) { + titles.push(col.title); + fields.push(col.field); + } + }); + var exportData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + exportData[this.name] = this.value; + }); + var param = { + 'wrkMastLog': exportData, + 'fields': fields + }; + $.ajax({ + url: baseUrl+"/agv/wrkMastLog/export/auth", + headers: {'token': localStorage.getItem('token')}, + data: JSON.stringify(param), + dataType:'json', + contentType:'application/json;charset=UTF-8', + method: 'POST', + success: function (res) { + layer.closeAll(); + if (res.code === 200) { + table.exportFile(titles,res.data,'xls'); + } else if (res.code === 403) { + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg) + } + } + }); + }); + break; + } + }); + + // 鐩戝惉琛屽伐鍏蜂簨浠� + table.on('tool(wrkMastLog)', function(obj){ + var data = obj.data; + switch (obj.event) { + // 鏄庣粏灞曠ず + case 'detlShow': + wrkNo = data.wrkNo; + ioTime = data.ioTime; + // 琛ㄦ牸涓嬫柟鏄剧ず + // locDetl(data.wrkNo); + // 寮瑰眰鏄剧ず + layer.open({ + type: 2, + title: '宸ヤ綔鏄庣粏鍘嗗彶妗�', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: true, + content: 'wrkDetlLog.html', + success: function(layero, index){ + } + }); + break; + // 璇︽儏 + case 'detail': + layer.open({ + type: 2, + title: '璇︽儏', + maxmin: true, + area: [top.detailWidth, top.detailHeight], + shadeClose: false, + content: 'wrkMastLog_detail.html', + success: function(layero, index){ + setFormVal(layer.getChildFrame('#detail', index), data, true); + top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true); + layero.find('iframe')[0].contentWindow.layui.form.render('select'); + layero.find('iframe')[0].contentWindow.layui.form.render('checkbox'); + layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide(); + layer.getChildFrame('##dealDownLine', index).hide(); + layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"}); + + } + }); + break; + } + }); + + // 鏁版嵁淇濆瓨鍔ㄤ綔 + form.on('submit(save)', function () { + if (banMsg != null){ + layer.msg(banMsg); + return; + } + method("add"); + }); + + // 鏁版嵁淇敼鍔ㄤ綔 + form.on('submit(edit)', function () { + method("update") + }); + + function method(name){ + var index = layer.load(1, { + shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙 + }); + var data = { +// id: $('#id').val(), + id: $('#id').val(), + wrkNo: $('#wrkNo').val(), + invWh: $('#invWh').val(), + ymd: top.strToDate($('#ymd\\$').val()), + mk: $('#mk').val(), + whsType: $('#whsType').val(), + wrkSts: $('#wrkSts').val(), + ioType: $('#ioType').val(), + crnNo: $('#crnNo').val(), + sheetNo: $('#sheetNo').val(), + ioPri: $('#ioPri').val(), + wrkDate: top.strToDate($('#wrkDate\\$').val()), + locNo: $('#locNo').val(), + staNo: $('#staNo').val(), + sourceStaNo: $('#sourceStaNo').val(), + sourceLocNo: $('#sourceLocNo').val(), + locSts: $('#locSts').val(), + picking: $('#picking').val(), + linkMis: $('#linkMis').val(), + onlineYn: $('#onlineYn').val(), + updMk: $('#updMk').val(), + exitMk: $('#exitMk').val(), + pltType: $('#pltType').val(), + emptyMk: $('#emptyMk').val(), + ioTime: top.strToDate($('#ioTime\\$').val()), + ctnType: $('#ctnType').val(), + packed: $('#packed').val(), + oveMk: $('#oveMk').val(), + mtnType: $('#mtnType').val(), + userNo: $('#userNo').val(), + crnStrTime: top.strToDate($('#crnStrTime\\$').val()), + crnEndTime: top.strToDate($('#crnEndTime\\$').val()), + plcStrTime: top.strToDate($('#plcStrTime\\$').val()), + crnPosTime: top.strToDate($('#crnPosTime\\$').val()), + loadTime: $('#loadTime').val(), + expTime: $('#expTime').val(), + refWrkno: $('#refWrkno').val(), + refIotime: top.strToDate($('#refIotime\\$').val()), + modiUser: $('#modiUser').val(), + modiTime: top.strToDate($('#modiTime\\$').val()), + appeUser: $('#appeUser').val(), + appeTime: top.strToDate($('#appeTime\\$').val()), + pauseMk: $('#pauseMk').val(), + errorTime: top.strToDate($('#errorTime\\$').val()), + errorMemo: $('#errorMemo').val(), + ctnKind: $('#ctnKind').val(), + manuType: $('#manuType').val(), + memoM: $('#memoM').val(), + scWeight: $('#scWeight').val(), + logMk: $('#logMk').val(), + logErrTime: top.strToDate($('#logErrTime\\$').val()), + logErrMemo: $('#logErrMemo').val(), + barcode: $('#barcode').val(), + PdcType: $('#PdcType').val(), + ctnNo: $('#ctnNo').val(), + fullPlt: $('#fullPlt').val(), + + }; + $.ajax({ + url: baseUrl+"/agv/wrkMastLog/"+name+"/auth", + headers: {'token': localStorage.getItem('token')}, + data: top.reObject(data), + method: 'POST', + success: function (res) { + if (res.code === 200){ + parent.layer.closeAll(); + parent.$(".layui-laypage-btn")[0].click(); + $("#data-detail :input").each(function () { + $(this).val(""); + }); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg) + } + layer.close(index); + } + }) + } + + // 澶嶉�夋浜嬩欢 + form.on('checkbox(detailCheckbox)', function (data) { + var el = data.elem; + if (el.checked) { + $(el).val('Y'); + } else { + $(el).val('N'); + } + }); + + // 鎼滅储鏍忔悳绱簨浠� + form.on('submit(search)', function (data) { + pageCurr = 1; + tableReload(false); + }); + + // 鎼滅储鏍忛噸缃簨浠� + form.on('submit(reset)', function (data) { + pageCurr = 1; + clearFormVal($('#search-box')); + tableReload(false); + }); + + // 鏃堕棿閫夋嫨鍣� + layDate.render({ + elem: '#ymd\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#wrkDate\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#ioTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#crnStrTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#crnEndTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#plcStrTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#crnPosTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#refIotime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#modiTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#appeTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#errorTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#logErrTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '.layui-laydate-range' + ,type: 'datetime' + ,range: true + }); + +}); + +// 鍏抽棴鍔ㄤ綔 +$(document).on('click','#data-detail-close', function () { + parent.layer.closeAll(); +}); + +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); + } + }); +} + +function setFormVal(el, data, showImg) { + for (var val in data) { + var find = el.find(":input[id='" + val + "']"); + if (find[0]!=null){ + if (find[0].type === 'checkbox'){ + if (data[val]==='Y'){ + find.attr("checked","checked"); + find.val('Y'); + } else { + find.remove("checked"); + find.val('N'); + } + continue; + } + } + find.val(data[val]); + if (showImg){ + var next = find.next(); + if (next.get(0)){ + if (next.get(0).localName === "img") { + find.hide(); + next.attr("src", data[val]); + next.show(); + } + } + } + } +} + +function clearFormVal(el) { + $(':input', el) + .val('') + .removeAttr('checked') + .removeAttr('selected'); +} + +function detailScreen(index) { + var detail = layer.getChildFrame('#data-detail', index); + var height = detail.height()+60; + if (height > ($(window).height()*0.9)) { + height = ($(window).height()*0.8); + } + layer.style(index, { +// top: (($(window).height()-height)/3)+"px", + height: height+'px' + }); +} + +$('body').keydown(function () { + if (event.keyCode === 13) { + $("#search").click(); + } +}); diff --git a/src/main/webapp/views/agvWrkMastLog/wrkMastLogWithWrktype.html b/src/main/webapp/views/agvWrkMastLog/wrkMastLogWithWrktype.html new file mode 100644 index 0000000..326bcd4 --- /dev/null +++ b/src/main/webapp/views/agvWrkMastLog/wrkMastLogWithWrktype.html @@ -0,0 +1,98 @@ +<!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"> +</head> +<body> +<!-- 鎼滅储鏍� --> +<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"> + </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()> + <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"> + </select> + </div> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline cool-auto-complete"> + <input id="ioType" class="layui-input" name="io_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none"> + <input id="ioType$" 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="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline cool-auto-complete"> + <input id="crnNo" class="layui-input" name="crn_no" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none"> + <input id="crnNo$" 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="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <!-- 鏃ユ湡鑼冨洿 --> + <div class="layui-inline" style="width: 300px"> + <div class="layui-input-inline"> + <input class="layui-input layui-laydate-range" name="io_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off"> + </div> + </div> + + <!-- 寰呮坊鍔� --> + <div id="data-search-btn" class="layui-btn-container layui-form-item"> + <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> + +<!-- 琛ㄦ牸 --> +<div class="layui-form"> + <table class="layui-hide" id="wrkMastLog" lay-filter="wrkMastLog"></table> +</div> +<script type="text/html" id="toolbar"> + <div class="layui-btn-container"> + <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button> + </div> +</script> + +<script type="text/html" id="operate"> + <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a> + <!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>--> +</script> + +<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/agvWrkMastLog/wrkMastLogWithWrktype.js" charset="utf-8"></script> + +<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe> + +</body> +</html> + -- Gitblit v1.9.1