From db1de2dced1def55238e8a2cba3fbdff70d0f3c1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 19 五月 2023 10:28:19 +0800
Subject: [PATCH] 指令日志查询
---
src/main/java/com/zy/asrs/controller/CommandInfoController.java | 16 ++
src/main/webapp/views/commandManageLog/commandManageLog.html | 58 +++++++
src/main/webapp/static/wms/js/commandManageLog/commandManageLog.js | 229 ++++++++++++++++++++++++++++
src/main/webapp/static/wms/js/commandManage/commandManage.js | 168 --------------------
4 files changed, 304 insertions(+), 167 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CommandInfoController.java b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
index 9101e77..5bd8726 100644
--- a/src/main/java/com/zy/asrs/controller/CommandInfoController.java
+++ b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
@@ -40,6 +40,22 @@
EntityWrapper<CommandInfo> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+ wrapper.in("command_status", "1,2");
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(commandInfoService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ @RequestMapping(value = "/commandInfo/listLog/auth")
+ @ManagerAuth
+ public R listLog(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<CommandInfo> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ wrapper.in("command_status", "3");
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(commandInfoService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/webapp/static/wms/js/commandManage/commandManage.js b/src/main/webapp/static/wms/js/commandManage/commandManage.js
index a8c46ba..fa66c05 100644
--- a/src/main/webapp/static/wms/js/commandManage/commandManage.js
+++ b/src/main/webapp/static/wms/js/commandManage/commandManage.js
@@ -1,10 +1,9 @@
var pageCurr;
var wrkNo;
-layui.use(['table','laydate', 'form'], function(){
+layui.use(['table', 'form'], function(){
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
- var layDate = layui.laydate;
var form = layui.form;
$("#wrkNo").val(parent.wrkNo)
@@ -126,116 +125,6 @@
}
});
- // 鏁版嵁淇濆瓨鍔ㄤ綔
- 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+"/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;
@@ -247,61 +136,6 @@
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
});
});
diff --git a/src/main/webapp/static/wms/js/commandManageLog/commandManageLog.js b/src/main/webapp/static/wms/js/commandManageLog/commandManageLog.js
new file mode 100644
index 0000000..72b4d35
--- /dev/null
+++ b/src/main/webapp/static/wms/js/commandManageLog/commandManageLog.js
@@ -0,0 +1,229 @@
+var pageCurr;
+var wrkNo;
+layui.use(['table', 'form'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var form = layui.form;
+
+ $("#wrkNo").val(parent.wrkNo)
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#commandManage',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/commandInfo/listLog/auth',
+ where: {wrk_no: parent.wrkNo},
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {field: 'id', 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: '鎸囦护绫诲瀷'}
+ ,{field: 'device', align: 'center',title: '璁惧'}
+ ,{field: 'deviceLog', align: 'center',title: '璁惧鎵ц淇℃伅'}
+ ,{field: 'commandDesc', align: 'center',title: '鍛戒护鎻忚堪'}
+ ,{field: 'startTime$', align: 'center',title: '寮�濮嬫椂闂�'}
+ ,{field: 'endTime$', align: 'center',title: '缁撴潫鏃堕棿'}
+ ,{field: 'command', align: 'center',title: '鍛戒护鎶ユ枃'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ 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(commandManage)', 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(commandManage)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch(obj.event) {
+ case 'refreshData':
+ tableIns.reload({
+ page: {
+ curr: pageCurr
+ }
+ });
+ limit();
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(commandManage)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ // 浠诲姟淇℃伅灞曠ず
+ case 'wrkMastShow':
+ wrkNo = data.wrkNo;
+ layer.open({
+ type: 2,
+ title: 'WMS浠诲姟',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../wrkMast/wrkMast.html',
+ success: function(layero, index){
+ }
+ });
+ break;
+ }
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(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/commandManageLog/commandManageLog.html b/src/main/webapp/views/commandManageLog/commandManageLog.html
new file mode 100644
index 0000000..304c165
--- /dev/null
+++ b/src/main/webapp/views/commandManageLog/commandManageLog.html
@@ -0,0 +1,58 @@
+<!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/wms/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/wms/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/wms/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="id" placeholder="鎸囦护缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="wrk_no" id="wrkNo" 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="commandManage" lay-filter="commandManage"></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="wrkMastShow">浠诲姟</a>
+</script>
+
+<script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/wms/js/commandManageLog/commandManageLog.js" charset="utf-8"></script>
+
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+
+</body>
+</html>
+
--
Gitblit v1.9.1