From f13bcd917e1a02f6df9cb8b1eb2159b6665354f0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 09 九月 2023 09:11:46 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js | 1 +
src/main/java/com/zy/asrs/entity/BasLiftErrLog.java | 10 +++++++++-
src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java | 11 ++++++++++-
src/main/resources/mapper/BasShuttleErrLogMapper.xml | 2 +-
src/main/resources/mapper/BasLiftErrLogMapper.xml | 1 +
src/main/webapp/static/js/basLiftErrLog/basLiftErrLog.js | 1 +
6 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasLiftErrLog.java b/src/main/java/com/zy/asrs/entity/BasLiftErrLog.java
index 4ccafad..6976152 100644
--- a/src/main/java/com/zy/asrs/entity/BasLiftErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasLiftErrLog.java
@@ -186,9 +186,16 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 绯荤粺鐘舵��
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵��")
+ @TableField("system_status")
+ private String systemStatus;
+
public BasLiftErrLog() {}
- public BasLiftErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer liftNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public BasLiftErrLog(String uuid, Integer wrkNo, Date startTime, Date endTime, Long wrkSts, Integer ioType, Integer liftNo, Integer plcNo, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String barcode, Integer errCode, String error, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, String systemStatus) {
this.uuid = uuid;
this.wrkNo = wrkNo;
this.startTime = startTime;
@@ -210,6 +217,7 @@
this.updateTime = updateTime;
this.updateBy = updateBy;
this.memo = memo;
+ this.systemStatus = systemStatus;
}
// BasLiftErrLog basLiftErrLog = new BasLiftErrLog(
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java b/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java
index 49a03fd..5c45c22 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java
@@ -186,9 +186,16 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 绯荤粺鐘舵��
+ */
+ @ApiModelProperty(value= "绯荤粺鐘舵��")
+ @TableField("system_status")
+ private String systemStatus;
+
public BasShuttleErrLog() {}
- public BasShuttleErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer shuttleNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public BasShuttleErrLog(String uuid, Integer wrkNo, Date startTime, Date endTime, Long wrkSts, Integer ioType, Integer shuttleNo, Integer plcNo, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String barcode, Integer errCode, String error, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, String systemStatus) {
this.uuid = uuid;
this.wrkNo = wrkNo;
this.startTime = startTime;
@@ -210,6 +217,7 @@
this.updateTime = updateTime;
this.updateBy = updateBy;
this.memo = memo;
+ this.systemStatus = systemStatus;
}
// BasShuttleErrLog basShuttleErrLog = new BasShuttleErrLog(
@@ -217,6 +225,7 @@
// null, // 宸ヤ綔鍙�
// null, // 鍙戠敓鏃堕棿
// null, // 缁撴潫鏃堕棿
+
// null, // 宸ヤ綔鐘舵��
// null, // 鍏ュ嚭搴撶被鍨�
// null, // 绌挎杞�
diff --git a/src/main/resources/mapper/BasLiftErrLogMapper.xml b/src/main/resources/mapper/BasLiftErrLogMapper.xml
index b427434..68c620f 100644
--- a/src/main/resources/mapper/BasLiftErrLogMapper.xml
+++ b/src/main/resources/mapper/BasLiftErrLogMapper.xml
@@ -26,6 +26,7 @@
<result column="update_time" property="updateTime" />
<result column="update_by" property="updateBy" />
<result column="memo" property="memo" />
+ <result column="system_status" property="systemStatus" />
</resultMap>
diff --git a/src/main/resources/mapper/BasShuttleErrLogMapper.xml b/src/main/resources/mapper/BasShuttleErrLogMapper.xml
index e554833..ba98429 100644
--- a/src/main/resources/mapper/BasShuttleErrLogMapper.xml
+++ b/src/main/resources/mapper/BasShuttleErrLogMapper.xml
@@ -11,7 +11,6 @@
<result column="end_time" property="endTime" />
<result column="wrk_sts" property="wrkSts" />
<result column="io_type" property="ioType" />
- <result column="ste_no" property="steNo" />
<result column="plc_no" property="plcNo" />
<result column="loc_no" property="locNo" />
<result column="sta_no" property="staNo" />
@@ -26,6 +25,7 @@
<result column="update_time" property="updateTime" />
<result column="update_by" property="updateBy" />
<result column="memo" property="memo" />
+ <result column="system_status" property="systemStatus" />
</resultMap>
diff --git a/src/main/webapp/static/js/basLiftErrLog/basLiftErrLog.js b/src/main/webapp/static/js/basLiftErrLog/basLiftErrLog.js
index c61794d..6406a58 100644
--- a/src/main/webapp/static/js/basLiftErrLog/basLiftErrLog.js
+++ b/src/main/webapp/static/js/basLiftErrLog/basLiftErrLog.js
@@ -39,6 +39,7 @@
,{field: 'errCode', align: 'center',title: '寮傚父鐮�'}
,{field: 'error', align: 'center',title: '寮傚父'}
,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌'}
+ ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
diff --git a/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js b/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js
index a158b94..241c6bb 100644
--- a/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js
+++ b/src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js
@@ -39,6 +39,7 @@
,{field: 'errCode', align: 'center',title: '寮傚父鐮�'}
,{field: 'error', align: 'center',title: '寮傚父'}
,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌'}
+ ,{field: 'systemStatus', align: 'center',title: '绯荤粺鐘舵��'}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
--
Gitblit v1.9.1