From 7c9a31347308abab5a6ee39046690ccc08c5f7c4 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 17 八月 2024 16:05:39 +0800
Subject: [PATCH] #界面
---
src/main/java/sqlFile/wrkMastExecuteLog.sql | 12 +-
src/main/webapp/views/basJarMastStatus/basJarMastStatus.html | 30 +++---
src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java | 45 ++++++--
src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js | 38 +++---
src/main/java/sqlFile/wrkMastExecute.sql | 12 +-
src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js | 40 ++++----
src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java | 1
src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html | 8
src/main/java/com/zy/asrs/controller/WrkMastCrnLogController.java | 1
src/main/java/com/zy/asrs/controller/WrkMastSplitTwinLogController.java | 1
src/main/java/com/zy/asrs/controller/WrkMastCrnController.java | 1
src/main/java/com/zy/asrs/entity/WrkMastExecute.java | 49 +++++++--
src/main/webapp/static/js/wrkMastSplitTwin/wrkMastSplitTwin.js | 2
src/main/webapp/static/js/basJarMastStatus/basJarMastStatus.js | 10 +-
src/main/java/com/zy/asrs/controller/WrkMastStaLogController.java | 1
src/main/java/com/zy/asrs/controller/WrkMastSplitTwinController.java | 1
src/main/java/com/zy/asrs/controller/WrkMastStaController.java | 1
src/main/webapp/static/js/wrkMastCrnLog/wrkMastCrnLog.js | 2
src/main/java/sqlFile/basJarMastStatus.sql | 12 +-
src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java | 1
src/main/webapp/static/js/wrkMastSplitTwinLog/wrkMastSplitTwinLog.js | 2
src/main/webapp/static/js/wrkMastCrn/wrkMastCrn.js | 2
22 files changed, 161 insertions(+), 111 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastCrnController.java b/src/main/java/com/zy/asrs/controller/WrkMastCrnController.java
index 03272c5..95e1609 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastCrnController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastCrnController.java
@@ -43,6 +43,7 @@
convert(param, wrapper);
allLike(WrkMastCrn.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("io_time", false);
return R.ok(wrkMastCrnService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastCrnLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastCrnLogController.java
index eafea31..bc0f1d0 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastCrnLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastCrnLogController.java
@@ -43,6 +43,7 @@
convert(param, wrapper);
allLike(WrkMastCrnLog.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("io_time", false);
return R.ok(wrkMastCrnLogService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java b/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java
index 2e6b755..56a1e32 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java
@@ -43,6 +43,7 @@
convert(param, wrapper);
allLike(WrkMastExecute.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("io_time", false);
return R.ok(wrkMastExecuteService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
index 62ac73c..72b5aa1 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
@@ -43,6 +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);
return R.ok(wrkMastExecuteLogService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinController.java b/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinController.java
index 7e23422..bf85894 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinController.java
@@ -43,6 +43,7 @@
convert(param, wrapper);
allLike(WrkMastSplitTwin.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("update_time", false);
return R.ok(wrkMastSplitTwinService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinLogController.java
index 9db2f10..8428d06 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastSplitTwinLogController.java
@@ -43,6 +43,7 @@
convert(param, wrapper);
allLike(WrkMastSplitTwinLog.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("update_time", false);
return R.ok(wrkMastSplitTwinLogService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastStaController.java b/src/main/java/com/zy/asrs/controller/WrkMastStaController.java
index 677ccbd..62fd839 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastStaController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastStaController.java
@@ -43,6 +43,7 @@
convert(param, wrapper);
allLike(WrkMastSta.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("update_time", false);
return R.ok(wrkMastStaService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastStaLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastStaLogController.java
index 99c5bea..9891d19 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastStaLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastStaLogController.java
@@ -43,6 +43,7 @@
convert(param, wrapper);
allLike(WrkMastStaLog.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("update_time", false);
return R.ok(wrkMastStaLogService.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 b241078..f7f3077 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
@@ -140,9 +141,9 @@
private Integer wrkSts;
/**
- * 浠诲姟绫诲瀷 0: 鏈煡 1: 寮�闂� 2: 鍏抽棬 3: 鍏ョ～鍖栫綈 4: 鍏ュ喎鍗存Ы 5: 绌挎杞﹁繘鍐峰嵈妲� 6: 绌挎杞︾寮�鍐峰嵈妲� 7: 鍑哄喎鍗存Ы
+ * 浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� B=>C 8: 绌挎杞︾寮�鍐峰嵈妲� C=>B 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
*/
- @ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡 1: 寮�闂� 2: 鍏抽棬 3: 鍏ョ～鍖栫綈 4: 鍏ュ喎鍗存Ы 5: 绌挎杞﹁繘鍐峰嵈妲� 6: 绌挎杞︾寮�鍐峰嵈妲� 7: 鍑哄喎鍗存Ы ")
+ @ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� B=>C 8: 绌挎杞︾寮�鍐峰嵈妲� C=>B 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A ")
@TableField("io_type")
private Integer ioType;
@@ -239,33 +240,53 @@
}
public String getWrkSts$(){
- BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
- BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basJarMastStatus)){
- return String.valueOf(basJarMastStatus.getId());
+ try{
+ if (Cools.isEmpty(this.wrkSts)){
+ return this.wrkSts+"锛氭湭鐭�";
+ }
+ BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
+// BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
+ BasJarMastStatus basJarMastStatus = service.selectOne(new EntityWrapper<BasJarMastStatus>().eq("box_type",this.wrkSts.toString()));
+ if (!Cools.isEmpty(basJarMastStatus)){
+ return String.valueOf(basJarMastStatus.getBoxSpecs());
+ }
+ } catch (Exception e){
+ return this.wrkSts+"锛氭湭鐭�==>寮傚父锛�"+e.getMessage();
}
- return null;
+ return this.wrkSts+"锛氭湭鐭�";
}
+ //浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� B=>C 8: 绌挎杞︾寮�鍐峰嵈妲� C=>B 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
+
public String getIoType$(){
- if (null == this.ioType){ return null; }
+ if (null == this.ioType){ return "鏈煡"; }
switch (this.ioType){
case 0:
return "鏈煡";
case 1:
- return "寮�闂�";
+ return "寮�杩涙枡闂�";
case 2:
- return "鍏抽棬";
+ return "鍏宠繘鏂欓棬";
case 3:
- return "鍏ョ～鍖栫綈";
+ return "寮�鍑烘枡闂�";
case 4:
- return "鍏ュ喎鍗存Ы";
+ return "鍏冲嚭鏂欓棬";
case 5:
- return "绌挎杞﹁繘鍐峰嵈妲�";
+ return "鍏ョ～鍖栫綈";
case 6:
- return "绌挎杞︾寮�鍐峰嵈妲�";
+ return "鍏ュ喎鍗存Ы";
case 7:
+ return "B=>C";
+ case 8:
+ return "C=>B";
+ case 9:
return "鍑哄喎鍗存Ы";
+ case 10:
+ return "A=>B";
+ case 11:
+ return "B=>A";
+ case 100:
+ return "鍏呯數浠诲姟";
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 e1db7be..d184963 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
@@ -260,33 +261,53 @@
}
public String getWrkSts$(){
- BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
- BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basJarMastStatus)){
- return String.valueOf(basJarMastStatus.getId());
+ try{
+ if (Cools.isEmpty(this.wrkSts)){
+ return this.wrkSts+"锛氭湭鐭�";
+ }
+ BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
+// BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
+ BasJarMastStatus basJarMastStatus = service.selectOne(new EntityWrapper<BasJarMastStatus>().eq("box_type",this.wrkSts.toString()));
+ if (!Cools.isEmpty(basJarMastStatus)){
+ return String.valueOf(basJarMastStatus.getBoxSpecs());
+ }
+ } catch (Exception e){
+ return this.wrkSts+"锛氭湭鐭�==>寮傚父锛�"+e.getMessage();
}
- return null;
+ return this.wrkSts+"锛氭湭鐭�";
}
+ //浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� B=>C 8: 绌挎杞︾寮�鍐峰嵈妲� C=>B 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
+
public String getIoType$(){
- if (null == this.ioType){ return null; }
+ if (null == this.ioType){ return "鏈煡"; }
switch (this.ioType){
case 0:
return "鏈煡";
case 1:
- return "寮�闂�";
+ return "寮�杩涙枡闂�";
case 2:
- return "鍏抽棬";
+ return "鍏宠繘鏂欓棬";
case 3:
- return "鍏ョ～鍖栫綈";
+ return "寮�鍑烘枡闂�";
case 4:
- return "鍏ュ喎鍗存Ы";
+ return "鍏冲嚭鏂欓棬";
case 5:
- return "绌挎杞﹁繘鍐峰嵈妲�";
+ return "鍏ョ～鍖栫綈";
case 6:
- return "绌挎杞︾寮�鍐峰嵈妲�";
+ return "鍏ュ喎鍗存Ы";
case 7:
+ return "B=>C";
+ case 8:
+ return "C=>B";
+ case 9:
return "鍑哄喎鍗存Ы";
+ case 10:
+ return "A=>B";
+ case 11:
+ return "B=>A";
+ case 100:
+ return "鍏呯數浠诲姟";
default:
return String.valueOf(this.ioType);
}
diff --git a/src/main/java/sqlFile/basJarMastStatus.sql b/src/main/java/sqlFile/basJarMastStatus.sql
index 44f4db1..20f7f9a 100644
--- a/src/main/java/sqlFile/basJarMastStatus.sql
+++ b/src/main/java/sqlFile/basJarMastStatus.sql
@@ -18,10 +18,10 @@
insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastStatus#btn-export', N'瀵煎嚭', '', '3', '4', '1');
-- cs
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastStatus/basJarMastStatus.html', N'纭寲缃愮姸鎬�', '142', '2', '21', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastStatus/basJarMastStatus.html', N'纭寲鍖哄煙浠诲姟鐘舵��', '142', '2', '21', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastStatus#view', N'鏌ヨ', '60610', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastStatus#btn-add', N'鏂板', '60610', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastStatus#btn-edit', N'缂栬緫', '60610', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastStatus#btn-delete', N'鍒犻櫎', '60610', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastStatus#btn-export', N'瀵煎嚭', '60610', '3', '4', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastStatus#view', N'鏌ヨ', '60646', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastStatus#btn-add', N'鏂板', '60646', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastStatus#btn-edit', N'缂栬緫', '60646', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastStatus#btn-delete', N'鍒犻櫎', '60646', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basJarMastStatus#btn-export', N'瀵煎嚭', '60646', '3', '4', '1');
diff --git a/src/main/java/sqlFile/wrkMastExecute.sql b/src/main/java/sqlFile/wrkMastExecute.sql
index 910ba79..e642c59 100644
--- a/src/main/java/sqlFile/wrkMastExecute.sql
+++ b/src/main/java/sqlFile/wrkMastExecute.sql
@@ -9,10 +9,10 @@
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecute#btn-export', '瀵煎嚭', '', '3', '4', '1');
-- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute/wrkMastExecute.html', N'wrkMastExecute绠＄悊', null, '2', null, '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute/wrkMastExecute.html', N'纭寲鍖哄煙鎵ц浠诲姟妗ｆ', '221', '2', '14', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-export', N'瀵煎嚭', '', '3', '4', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#view', N'鏌ヨ', '60634', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-add', N'鏂板', '60634', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-edit', N'缂栬緫', '60634', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-delete', N'鍒犻櫎', '60634', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecute#btn-export', N'瀵煎嚭', '60634', '3', '4', '1');
diff --git a/src/main/java/sqlFile/wrkMastExecuteLog.sql b/src/main/java/sqlFile/wrkMastExecuteLog.sql
index cdd548f..1f40994 100644
--- a/src/main/java/sqlFile/wrkMastExecuteLog.sql
+++ b/src/main/java/sqlFile/wrkMastExecuteLog.sql
@@ -9,10 +9,10 @@
insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'wrkMastExecuteLog#btn-export', '瀵煎嚭', '', '3', '4', '1');
-- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog/wrkMastExecuteLog.html', N'wrkMastExecuteLog绠＄悊', null, '2', null, '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog/wrkMastExecuteLog.html', N'纭寲鍖哄煙鎵ц浠诲姟鍘嗗彶妗ｆ', '221', '2', '15', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#view', N'鏌ヨ', '', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-add', N'鏂板', '', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-edit', N'缂栬緫', '', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-export', N'瀵煎嚭', '', '3', '4', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#view', N'鏌ヨ', '60640', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-add', N'鏂板', '60640', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-edit', N'缂栬緫', '60640', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-delete', N'鍒犻櫎', '60640', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'wrkMastExecuteLog#btn-export', N'瀵煎嚭', '60640', '3', '4', '1');
diff --git a/src/main/webapp/static/js/basJarMastStatus/basJarMastStatus.js b/src/main/webapp/static/js/basJarMastStatus/basJarMastStatus.js
index 7bf948c..64ad8a0 100644
--- a/src/main/webapp/static/js/basJarMastStatus/basJarMastStatus.js
+++ b/src/main/webapp/static/js/basJarMastStatus/basJarMastStatus.js
@@ -21,12 +21,12 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'boxSpecs', align: 'center',title: '浠诲姟鍙�'}
- ,{field: 'boxType', align: 'center',title: '鍫嗗灈鏈�'}
+ // {type: 'checkbox'},
+ {field: 'id', align: 'center',title: 'ID', hide : true}
+ ,{field: 'boxType', align: 'center',title: '宸ヤ綔鐘舵�佷唬鍙�'}
+ ,{field: 'boxSpecs', align: 'center',title: '宸ヤ綔鐘舵��'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120,hide : true}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/wrkMastCrn/wrkMastCrn.js b/src/main/webapp/static/js/wrkMastCrn/wrkMastCrn.js
index 649da57..a1d2793 100644
--- a/src/main/webapp/static/js/wrkMastCrn/wrkMastCrn.js
+++ b/src/main/webapp/static/js/wrkMastCrn/wrkMastCrn.js
@@ -43,7 +43,7 @@
,{field: 'sourceLocNoTwo', align: 'center',title: '婧愬簱浣�2', hide: true}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', hide: true}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: false}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/static/js/wrkMastCrnLog/wrkMastCrnLog.js b/src/main/webapp/static/js/wrkMastCrnLog/wrkMastCrnLog.js
index 0b4d671..80a38ee 100644
--- a/src/main/webapp/static/js/wrkMastCrnLog/wrkMastCrnLog.js
+++ b/src/main/webapp/static/js/wrkMastCrnLog/wrkMastCrnLog.js
@@ -43,7 +43,7 @@
,{field: 'sourceLocNoTwo', align: 'center',title: '婧愬簱浣�2', hide: true}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', hide: true}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: false}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120, hide: true}
]],
diff --git a/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js b/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js
index c72c0cf..ebf0cb0 100644
--- a/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js
+++ b/src/main/webapp/static/js/wrkMastExecute/wrkMastExecute.js
@@ -22,25 +22,25 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'enterStaNo', align: 'center',title: '鍏ュ簱婧愮珯鐐�'}
- ,{field: 'outStaNo', align: 'center',title: '鍏ュ簱鐩爣绔欑偣'}
- ,{field: 'jarEnterStaNo', align: 'center',title: '鍏ョ～鍖栫綈绔欑偣'}
- ,{field: 'jarOutStaNo', align: 'center',title: '鍑虹～鍖栫綈绔欑偣'}
- ,{field: 'jarId', align: 'center',title: '璁惧ID'}
- ,{field: 'jarRegin', align: 'center',title: '鍖哄煙'}
- ,{field: 'status', align: 'center',title: '鐘舵��'}
- ,{field: 'steId', align: 'center',title: '绌挎鏉�'}
- ,{field: 'rgvId', align: 'center',title: 'RGV'}
- ,{field: 'ioTime$', align: 'center',title: '浣滀笟鏃堕棿'}
- ,{field: 'modiTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
- ,{field: 'appeTime$', align: 'center',title: '鏇存柊鏃堕棿'}
- ,{field: 'wrkType$', align: 'center',title: '浠诲姟鐘舵��'}
- ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
- ,{field: 'ioType$', align: 'center',title: '浠诲姟绫诲瀷'}
- ,{field: 'type$', align: 'center',title: '璁惧'}
- ,{field: 'rgvEndId', align: 'center',title: '灏鹃儴绌挎鏉�'}
+ ,{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}
+ ,{field: 'ioType$', align: 'center',title: '浠诲姟绫诲瀷', hide: false}
+ ,{field: 'enterStaNo', align: 'center',title: '鍏ュ簱婧愮珯鐐�', hide: true}
+ ,{field: 'outStaNo', align: 'center',title: '鍏ュ簱鐩爣绔欑偣', hide: true}
+ ,{field: 'jarEnterStaNo', align: 'center',title: '鍏ョ～鍖栫綈绔欑偣', hide: false}
+ ,{field: 'jarOutStaNo', align: 'center',title: '鍑虹～鍖栫綈绔欑偣', hide: false}
+ ,{field: 'jarId', align: 'center',title: '璁惧ID', hide: false}
+ ,{field: 'jarRegin', align: 'center',title: '鍖哄煙', hide: false}
+ ,{field: 'status', align: 'center',title: '鐘舵��', hide: true}
+ ,{field: 'steId', align: 'center',title: '绌挎鏉�', hide: false}
+ ,{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: 'appeTime$', align: 'center',title: '鏇存柊鏃堕棿', hide: false}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js b/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js
index cc50aad..c5113c7 100644
--- a/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js
+++ b/src/main/webapp/static/js/wrkMastExecuteLog/wrkMastExecuteLog.js
@@ -22,27 +22,27 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'enterStaNo', align: 'center',title: '鍏ュ簱婧愮珯鐐�'}
- ,{field: 'outStaNo', align: 'center',title: '鍏ュ簱鐩爣绔欑偣'}
- ,{field: 'jarEnterStaNo', align: 'center',title: '鍏ョ～鍖栫綈绔欑偣'}
- ,{field: 'jarOutStaNo', align: 'center',title: '鍑虹～鍖栫綈绔欑偣'}
- ,{field: 'jarId', align: 'center',title: '璁惧ID'}
- ,{field: 'jarRegin', align: 'center',title: '鍖哄煙'}
- ,{field: 'status', align: 'center',title: '鐘舵��'}
- ,{field: 'steId', align: 'center',title: '绌挎鏉�'}
- ,{field: 'rgvId', align: 'center',title: 'RGV'}
- ,{field: 'ioTime$', align: 'center',title: '浣滀笟鏃堕棿'}
- ,{field: 'modiTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
- ,{field: 'appeTime$', align: 'center',title: '鏇存柊鏃堕棿'}
- ,{field: 'wrkType$', align: 'center',title: '浠诲姟鐘舵��'}
- ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
- ,{field: 'ioType$', align: 'center',title: '浠诲姟绫诲瀷'}
- ,{field: 'type$', align: 'center',title: '璁惧'}
- ,{field: 'rgvEndId', align: 'center',title: '灏鹃儴绌挎鏉�'}
+ ,{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}
+ ,{field: 'ioType$', align: 'center',title: '浠诲姟绫诲瀷', hide: false}
+ ,{field: 'enterStaNo', align: 'center',title: '鍏ュ簱婧愮珯鐐�', hide: true}
+ ,{field: 'outStaNo', align: 'center',title: '鍏ュ簱鐩爣绔欑偣', hide: true}
+ ,{field: 'jarEnterStaNo', align: 'center',title: '鍏ョ～鍖栫綈绔欑偣', hide: false}
+ ,{field: 'jarOutStaNo', align: 'center',title: '鍑虹～鍖栫綈绔欑偣', hide: false}
+ ,{field: 'jarId', align: 'center',title: '璁惧ID', hide: false}
+ ,{field: 'jarRegin', align: 'center',title: '鍖哄煙', hide: false}
+ ,{field: 'status', align: 'center',title: '鐘舵��', hide: true}
+ ,{field: 'steId', align: 'center',title: '绌挎鏉�', hide: false}
+ ,{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: 'appeTime$', align: 'center',title: '鏇存柊鏃堕棿', hide: false}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120, hide: true}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/wrkMastSplitTwin/wrkMastSplitTwin.js b/src/main/webapp/static/js/wrkMastSplitTwin/wrkMastSplitTwin.js
index eab0ffc..8a380fd 100644
--- a/src/main/webapp/static/js/wrkMastSplitTwin/wrkMastSplitTwin.js
+++ b/src/main/webapp/static/js/wrkMastSplitTwin/wrkMastSplitTwin.js
@@ -40,7 +40,7 @@
,{field: 'endLev', align: 'center',title: '缁堢偣灞�', hide:true}
,{field: 'bignTime$', align: 'center',title: '鏍囪鏃堕棿', hide:true}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿', hide:true}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide:false}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120, hide:true}
]],
diff --git a/src/main/webapp/static/js/wrkMastSplitTwinLog/wrkMastSplitTwinLog.js b/src/main/webapp/static/js/wrkMastSplitTwinLog/wrkMastSplitTwinLog.js
index b3af48e..5f3036b 100644
--- a/src/main/webapp/static/js/wrkMastSplitTwinLog/wrkMastSplitTwinLog.js
+++ b/src/main/webapp/static/js/wrkMastSplitTwinLog/wrkMastSplitTwinLog.js
@@ -40,7 +40,7 @@
,{field: 'endLev', align: 'center',title: '缁堢偣灞�', hide:true}
,{field: 'bignTime$', align: 'center',title: '鏍囪鏃堕棿', hide:true}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿', hide:true}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide:false}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120, hide:true}
]],
diff --git a/src/main/webapp/views/basJarMastStatus/basJarMastStatus.html b/src/main/webapp/views/basJarMastStatus/basJarMastStatus.html
index 7a522fa..8ec37bb 100644
--- a/src/main/webapp/views/basJarMastStatus/basJarMastStatus.html
+++ b/src/main/webapp/views/basJarMastStatus/basJarMastStatus.html
@@ -17,11 +17,11 @@
<div class="layui-card-body">
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
- <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="id" 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="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
@@ -50,14 +50,14 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
</div>
</script>
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>-->
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -73,17 +73,17 @@
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">浠诲姟鍙�: </label>
+ <label class="layui-form-label layui-form-required">宸ヤ綔鐘舵��: </label>
<div class="layui-input-block">
- <input class="layui-input" name="boxSpecs" placeholder="璇疯緭鍏ヤ换鍔″彿" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="boxSpecs" placeholder="璇疯緭鍏ュ伐浣滅姸鎬�" lay-vertype="tips" lay-verify="required">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍫嗗灈鏈�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="boxType" placeholder="璇疯緭鍏ュ爢鍨涙満">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">宸ヤ綔鐘舵�佷唬鍙�: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="boxType" placeholder="璇疯緭鍏ュ伐浣滅姸鎬佷唬鍙�">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
diff --git a/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html b/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
index 98364f4..68dc448 100644
--- a/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
+++ b/src/main/webapp/views/wrkMastExecuteLog/wrkMastExecuteLog.html
@@ -49,15 +49,15 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
+<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
</div>
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>-->
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
--
Gitblit v1.9.1