From 09c46e67c54d9ea538e2041565f57e995c60ccb8 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期日, 25 五月 2025 12:58:52 +0800
Subject: [PATCH] 外置输送线修改
---
src/main/java/com/zy/asrs/entity/BasErrLog.java | 149 +++++++++++++++++++++++++------------------------
1 files changed, 76 insertions(+), 73 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasErrLog.java b/src/main/java/com/zy/asrs/entity/BasErrLog.java
index f135e6b..3e6aadf 100644
--- a/src/main/java/com/zy/asrs/entity/BasErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasErrLog.java
@@ -22,155 +22,156 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
private String uuid;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 鍙戠敓鏃堕棿
*/
- @ApiModelProperty(value= "鍙戠敓鏃堕棿")
+ @ApiModelProperty(value = "鍙戠敓鏃堕棿")
@TableField("start_time")
private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
- @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
@TableField("end_time")
private Date endTime;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Long wrkSts;
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
private Integer ioType;
/**
* 鍫嗗灈鏈�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈�")
+ @ApiModelProperty(value = "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
/**
* plc
*/
- @ApiModelProperty(value= "plc")
+ @ApiModelProperty(value = "plc")
@TableField("plc_no")
private Integer plcNo;
/**
* 鐩爣搴撲綅
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
+ @ApiModelProperty(value = "鐩爣搴撲綅")
@TableField("loc_no")
private String locNo;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @ApiModelProperty(value = "鐩爣绔�")
@TableField("sta_no")
private Integer staNo;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @ApiModelProperty(value = "婧愮珯")
@TableField("source_sta_no")
private Integer sourceStaNo;
/**
* 婧愬簱浣�
*/
- @ApiModelProperty(value= "婧愬簱浣�")
+ @ApiModelProperty(value = "婧愬簱浣�")
@TableField("source_loc_no")
private String sourceLocNo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 寮傚父鐮�
*/
- @ApiModelProperty(value= "寮傚父鐮�")
+ @ApiModelProperty(value = "寮傚父鐮�")
@TableField("err_code")
private Integer errCode;
/**
* 寮傚父
*/
- @ApiModelProperty(value= "寮傚父")
+ @ApiModelProperty(value = "寮傚父")
private String error;
/**
- * 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
+ * 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
*/
- @ApiModelProperty(value= "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
+ @ApiModelProperty(value = "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
private Integer status;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
private Date createTime;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
private Date updateTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public BasErrLog() {}
+ public BasErrLog() {
+ }
- public BasErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer crnNo,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 BasErrLog(String uuid, Integer wrkNo, Date startTime, Date endTime, Long wrkSts, Integer ioType, Integer crnNo, 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) {
this.uuid = uuid;
this.wrkNo = wrkNo;
this.startTime = startTime;
@@ -246,30 +247,30 @@
return startTime;
}
- public String getStartTime$(){
- if (Cools.isEmpty(this.startTime)){
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getStartTime$() {
+ if (Cools.isEmpty(this.startTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
}
public Date getEndTime() {
return endTime;
}
- public String getEndTime$(){
- if (Cools.isEmpty(this.endTime)){
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getEndTime$() {
+ if (Cools.isEmpty(this.endTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
}
public Long getWrkSts() {
@@ -364,9 +365,15 @@
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "鏈鐞�";
case 2:
@@ -376,72 +383,68 @@
}
}
- public void setStatus(Integer status) {
- this.status = status;
- }
-
public Date getCreateTime() {
return createTime;
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
- public Long getCreateBy() {
- return createBy;
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
+ public Long getCreateBy() {
+ return createBy;
}
public void setCreateBy(Long createBy) {
this.createBy = createBy;
}
- public Date getUpdateTime() {
- return updateTime;
+ public String getCreateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ public Date getUpdateTime() {
+ return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
public Long getUpdateBy() {
return updateBy;
}
- public String getUpdateBy$(){
+ public void setUpdateBy(Long updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setUpdateBy(Long updateBy) {
- this.updateBy = updateBy;
}
public String getMemo() {
--
Gitblit v1.9.1