From d9bd47abe7980a861186187481c6bd0af72159dc Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 14 一月 2025 14:54:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java | 26 ++++++------
src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java | 2
src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js | 8 ++--
src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html | 10 +++++
src/main/webapp/views/wrkMastExecute/wrkMastExecute.html | 10 +++++
src/main/java/com/zy/asrs/entity/WrkMastExecute.java | 26 ++++++------
6 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
index 72b5aa1..b0c5753 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
@@ -43,7 +43,7 @@
convert(param, wrapper);
allLike(WrkMastExecuteLog.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderBy("io_time", false);
+ wrapper.orderBy("modi_time", false);
return R.ok(wrkMastExecuteLogService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
index 500bdd2..b12e7b4 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
@@ -364,31 +364,31 @@
if (null == this.ioType){ return "鏈煡"; }
switch (this.ioType){
case 0:
- return "鏈煡";
+ return "0.鏈煡";
case 1:
- return "寮�杩涙枡闂�";
+ return "1.寮�杩涙枡闂�";
case 2:
- return "鍏宠繘鏂欓棬";
+ return "2.鍏宠繘鏂欓棬";
case 3:
- return "寮�鍑烘枡闂�";
+ return "3.寮�鍑烘枡闂�";
case 4:
- return "鍏冲嚭鏂欓棬";
+ return "4.鍏冲嚭鏂欓棬";
case 5:
- return "鍏ョ～鍖栫綈";
+ return "5.鍏ョ～鍖栫綈";
case 6:
- return "鍏ュ喎鍗存Ы";
+ return "6.鍏ュ喎鍗存Ы";
case 7:
- return "B=>C";
+ return "7.B=>C";
case 8:
- return "C=>B";
+ return "8.C=>B";
case 9:
- return "鍑哄喎鍗存Ы";
+ return "9.鍑哄喎鍗存Ы";
case 10:
- return "A=>B";
+ return "10.A=>B";
case 11:
- return "B=>A";
+ return "11.B=>A";
case 100:
- return "鍏呯數浠诲姟";
+ return "100.鍏呯數浠诲姟";
default:
return String.valueOf(this.ioType);
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
index 7838cd9..953418a 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
@@ -397,31 +397,31 @@
if (null == this.ioType){ return "鏈煡"; }
switch (this.ioType){
case 0:
- return "鏈煡";
+ return "0.鏈煡";
case 1:
- return "寮�杩涙枡闂�";
+ return "1.寮�杩涙枡闂�";
case 2:
- return "鍏宠繘鏂欓棬";
+ return "2.鍏宠繘鏂欓棬";
case 3:
- return "寮�鍑烘枡闂�";
+ return "3.寮�鍑烘枡闂�";
case 4:
- return "鍏冲嚭鏂欓棬";
+ return "4.鍏冲嚭鏂欓棬";
case 5:
- return "鍏ョ～鍖栫綈";
+ return "5.鍏ョ～鍖栫綈";
case 6:
- return "鍏ュ喎鍗存Ы";
+ return "6.鍏ュ喎鍗存Ы";
case 7:
- return "B=>C";
+ return "7.B=>C";
case 8:
- return "C=>B";
+ return "8.C=>B";
case 9:
- return "鍑哄喎鍗存Ы";
+ return "9.鍑哄喎鍗存Ы";
case 10:
- return "A=>B";
+ return "10.A=>B";
case 11:
- return "B=>A";
+ return "11.B=>A";
case 100:
- return "鍏呯數浠诲姟";
+ return "100.鍏呯數浠诲姟";
default:
return String.valueOf(this.ioType);
}
diff --git a/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js b/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js
index c5113c7..d640504 100644
--- a/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js
+++ b/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js
@@ -21,8 +21,8 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID', hide: true}
+ // {type: 'checkbox'},
+ {field: 'id', align: 'center',title: 'ID', hide: true}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�', hide: false}
,{field: 'wrkType$', align: 'center',title: '浠诲姟鐘舵��', hide: false}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', hide: false}
@@ -38,8 +38,8 @@
,{field: 'rgvId', align: 'center',title: 'RGV', hide: false}
,{field: 'type$', align: 'center',title: '璁惧', hide: true}
,{field: 'rgvEndId', align: 'center',title: '灏鹃儴绌挎鏉�', hide: true}
- ,{field: 'ioTime$', align: 'center',title: '浣滀笟鏃堕棿', hide: true}
- ,{field: 'modiTime$', align: 'center',title: '鍒涘缓鏃堕棿', hide: true}
+ ,{field: 'ioTime$', align: 'center',title: '浣滀笟鏃堕棿', hide: false}
+ ,{field: 'modiTime$', align: 'center',title: '鍒涘缓鏃堕棿', hide: false}
,{field: 'appeTime$', align: 'center',title: '鏇存柊鏃堕棿', hide: false}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120, hide: true}
diff --git a/src/main/webapp/views/wrkMastExecute/wrkMastExecute.html b/src/main/webapp/views/wrkMastExecute/wrkMastExecute.html
index fa35c47..8b678fe 100644
--- a/src/main/webapp/views/wrkMastExecute/wrkMastExecute.html
+++ b/src/main/webapp/views/wrkMastExecute/wrkMastExecute.html
@@ -29,6 +29,16 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="jar_id" placeholder="璁惧鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="io_type" placeholder="浠诲姟绫诲瀷" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
diff --git a/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html b/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
index 4abb90b..eccf1b4 100644
--- a/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
+++ b/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
@@ -29,6 +29,16 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="jar_id" placeholder="璁惧鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="io_type" placeholder="浠诲姟绫诲瀷" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
--
Gitblit v1.9.1