From e7ba6232e39e30283a4e7f775eb997fc9da8e52e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 11 十月 2023 10:26:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java b/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java
index 12e1eb4..5c45c22 100644
--- a/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java
@@ -87,8 +87,8 @@
* 绌挎杞�
*/
@ApiModelProperty(value= "绌挎杞�")
- @TableField("ste_no")
- private Integer steNo;
+ @TableField("shuttle_no")
+ private Integer shuttleNo;
/**
* plc
@@ -186,16 +186,23 @@
@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 steNo,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;
this.endTime = endTime;
this.wrkSts = wrkSts;
this.ioType = ioType;
- this.steNo = steNo;
+ this.shuttleNo = shuttleNo;
this.plcNo = plcNo;
this.locNo = locNo;
this.staNo = staNo;
@@ -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, // 绌挎杞�
--
Gitblit v1.9.1