From 927ef945f50493e6257056856459ac4d2c78804f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 09 九月 2023 09:31:55 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/BasShuttleOptMapper.xml | 1 +
src/main/java/com/zy/asrs/entity/BasLiftOpt.java | 10 +++++++++-
src/main/resources/mapper/BasLiftOptMapper.xml | 1 +
src/main/webapp/static/js/basLiftOpt/basLiftOpt.js | 1 +
src/main/java/com/zy/asrs/entity/BasShuttleOpt.java | 10 +++++++++-
src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js | 1 +
6 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasLiftOpt.java b/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
index 47a3045..89fe287 100644
--- a/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasLiftOpt.java
@@ -76,9 +76,16 @@
@ApiModelProperty(value= "鍛戒护")
private String command;
+ /**
+ * 绯荤粺鐘舵��
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵��")
+ @TableField("system_status")
+ private String systemStatus;
+
public BasLiftOpt() {}
- public BasLiftOpt(Integer wrkNo,Integer liftNo,Date sendTime,Date updateTime,Long updateBy,String memo,String command) {
+ public BasLiftOpt(Integer wrkNo, Integer liftNo, Date sendTime, Date updateTime, Long updateBy, String memo, String command, String systemStatus) {
this.wrkNo = wrkNo;
this.liftNo = liftNo;
this.sendTime = sendTime;
@@ -86,6 +93,7 @@
this.updateBy = updateBy;
this.memo = memo;
this.command = command;
+ this.systemStatus = systemStatus;
}
// BasLiftOpt basLiftOpt = new BasLiftOpt(
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java b/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
index c1e01cf..e0dac67 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttleOpt.java
@@ -99,9 +99,16 @@
@ApiModelProperty(value= "鍛戒护")
private String command;
+ /**
+ * 绯荤粺鐘舵��
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵��")
+ @TableField("system_status")
+ private String systemStatus;
+
public BasShuttleOpt() {}
- public BasShuttleOpt(Integer wrkNo,Integer shuttleNo, Date sendTime,String mode,String sourceLocNo,String distLocNo, Date updateTime, Long updateBy, String memo,String command) {
+ public BasShuttleOpt(Integer wrkNo, Integer shuttleNo, Date sendTime, String mode, String sourceLocNo, String distLocNo, Date updateTime, Long updateBy, String memo, String command, String systemStatus) {
this.wrkNo = wrkNo;
this.shuttleNo = shuttleNo;
this.sendTime = sendTime;
@@ -112,6 +119,7 @@
this.updateBy = updateBy;
this.memo = memo;
this.command = command;
+ this.systemStatus = systemStatus;
}
// BasShuttleErrLog basShuttleErrLog = new BasShuttleErrLog(
diff --git a/src/main/resources/mapper/BasLiftOptMapper.xml b/src/main/resources/mapper/BasLiftOptMapper.xml
index b2f2cc4..0d9fa3f 100644
--- a/src/main/resources/mapper/BasLiftOptMapper.xml
+++ b/src/main/resources/mapper/BasLiftOptMapper.xml
@@ -12,6 +12,7 @@
<result column="update_by" property="updateBy" />
<result column="memo" property="memo" />
<result column="command" property="command" />
+ <result column="system_status" property="systemStatus" />
</resultMap>
diff --git a/src/main/resources/mapper/BasShuttleOptMapper.xml b/src/main/resources/mapper/BasShuttleOptMapper.xml
index dd0694a..a072104 100644
--- a/src/main/resources/mapper/BasShuttleOptMapper.xml
+++ b/src/main/resources/mapper/BasShuttleOptMapper.xml
@@ -15,6 +15,7 @@
<result column="update_by" property="updateBy" />
<result column="memo" property="memo" />
<result column="command" property="command" />
+ <result column="system_status" property="systemStatus" />
</resultMap>
diff --git a/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js b/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js
index 645a9db..6b277cc 100644
--- a/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js
+++ b/src/main/webapp/static/js/basLiftOpt/basLiftOpt.js
@@ -30,6 +30,7 @@
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
,{field: 'command', align: 'center',title: '鍛戒护'}
+ ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
// ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js b/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
index bdf3e33..6fbeae0 100644
--- a/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
+++ b/src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js
@@ -27,6 +27,7 @@
,{field: 'sourceLocNo', align: 'center',title: '璧风偣搴撲綅'}
,{field: 'distLocNo', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'command', align: 'center',title: '鍛戒护'}
+ ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
,{field: 'sendTime$', align: 'center',title: '涓嬪彂鏃堕棿'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
--
Gitblit v1.9.1