From af5081bc0d0668d526a204076557a171097ddb8d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 二月 2026 14:02:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into ctu_conveyor
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java | 153 +++++++++++++++------------------------------------
1 files changed, 45 insertions(+), 108 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
index 4c8df17..9a49997 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
@@ -18,190 +18,106 @@
private static final long serialVersionUID = 1L;
- /**
- * ID
- */
@ApiModelProperty(value= "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- /**
- * 缂栧彿
- */
@ApiModelProperty(value= "缂栧彿")
private String uuid;
- /**
- * 鎬荤嚎
- */
@ApiModelProperty(value= "鎬荤嚎")
private Long busId;
- /**
- * 浠诲姟鍙�
- */
@ApiModelProperty(value= "浠诲姟鍙�")
private String seqNum;
- /**
- * 浼樺厛绾�
- */
@ApiModelProperty(value= "浼樺厛绾�")
private Integer priority;
- /**
- * 鍚嶇О
- */
@ApiModelProperty(value= "鍚嶇О")
private String name;
- /**
- * 浠诲姟杩涘害
- */
@ApiModelProperty(value= "浠诲姟杩涘害")
private Long taskSts;
- /**
- * 浠诲姟绫诲瀷
- */
@ApiModelProperty(value= "浠诲姟绫诲瀷")
private Long taskType;
- /**
- * AGV
- */
@ApiModelProperty(value= "AGV")
private Long agvId;
- /**
- * 宸ヤ綔鏃堕棿
- */
@ApiModelProperty(value= "宸ヤ綔鏃堕棿")
private Date ioTime;
- /**
- * 寮�濮嬫椂闂�
- */
@ApiModelProperty(value= "寮�濮嬫椂闂�")
private Date startTime;
- /**
- * 缁撴潫鏃堕棿
- */
@ApiModelProperty(value= "缁撴潫鏃堕棿")
private Date endTime;
- /**
- * 寮傚父鏃堕棿
- */
@ApiModelProperty(value= "寮傚父鏃堕棿")
private Date errTime;
- /**
- * 璧峰绔�
- */
@ApiModelProperty(value= "璧峰绔�")
private Long oriSta;
- /**
- * 璧峰搴撲綅
- */
@ApiModelProperty(value= "璧峰搴撲綅")
private Long oriLoc;
- /**
- * 璧峰鐮�
- */
@ApiModelProperty(value= "璧峰鐮�")
private Long oriCode;
- /**
- * 鐩爣绔�
- */
+ @ApiModelProperty(value= "璧峰宸烽亾鍝堝笇")
+ private String oriLaneHash;
+
@ApiModelProperty(value= "鐩爣绔�")
private Long destSta;
- /**
- * 鐩爣搴撲綅
- */
@ApiModelProperty(value= "鐩爣搴撲綅")
private Long destLoc;
- /**
- * 鐩爣鐮�
- */
@ApiModelProperty(value= "鐩爣鐮�")
private Long destCode;
- /**
- * 绌烘澘
- */
+ @ApiModelProperty(value= "鐩爣宸烽亾鍝堝笇")
+ private String destLaneHash;
+
@ApiModelProperty(value= "绌烘澘")
private String emptyMk;
- /**
- * 鎵樼洏鐮�
- */
+ @ApiModelProperty(value= "涓婅鐘舵��")
+ private String uplinkSts;
+
@ApiModelProperty(value= "鎵樼洏鐮�")
private String zpallet;
- /**
- * 鐜妭
- */
@ApiModelProperty(value= "鐜妭")
private String phase;
- /**
- * 寮傚父鎻忚堪
- */
@ApiModelProperty(value= "寮傚父鎻忚堪")
private String errDesc;
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
- */
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
- /**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
- */
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
private Integer deleted;
- /**
- * 绉熸埛
- */
@ApiModelProperty(value= "绉熸埛")
private Long tenantId;
- /**
- * 娣诲姞浜哄憳
- */
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
- /**
- * 娣诲姞鏃堕棿
- */
@ApiModelProperty(value= "娣诲姞鏃堕棿")
private Date createTime;
- /**
- * 淇敼浜哄憳
- */
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
- /**
- * 淇敼鏃堕棿
- */
@ApiModelProperty(value= "淇敼鏃堕棿")
private Date updateTime;
- /**
- * 澶囨敞
- */
@ApiModelProperty(value= "澶囨敞")
private String memo;
@@ -273,7 +189,7 @@
BusService service = SpringUtils.getBean(BusService.class);
Bus bus = service.getById(this.busId);
if (!Cools.isEmpty(bus)){
- return String.valueOf(bus.getUuid());
+ return String.valueOf(bus.getBusNo());
}
return null;
}
@@ -368,20 +284,6 @@
return null;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "鍐荤粨";
- default:
- return String.valueOf(this.status);
- }
- }
-
-
-
public Boolean getStatusBool(){
if (null == this.status){ return null; }
switch (this.status){
@@ -394,5 +296,40 @@
}
}
+ public String getOriDesc() {
+ String oriDesc = "";
+ if (null != this.oriSta) {
+ oriDesc = "STA" + " - " + this.getOriSta$();
+ }
+ if (null != this.oriLoc) {
+ oriDesc = "LOC" + " - " + this.getOriLoc$();
+ }
+ if (!Cools.isEmpty(oriDesc)) {
+ if (null != this.oriCode) {
+ oriDesc = oriDesc + " (" + this.getOriCode$() + ")";
+ }
+ } else {
+ oriDesc = "CODE" + " - " + this.getOriCode$();
+ }
+ return oriDesc;
+ }
+
+ public String getDestDesc() {
+ String destDesc = "";
+ if (null != this.destSta) {
+ destDesc = "STA" + " - " + this.getDestSta$();
+ }
+ if (null != this.destLoc) {
+ destDesc = "LOC" + " - " + this.getDestLoc$();
+ }
+ if (!Cools.isEmpty(destDesc)) {
+ if (null != this.destCode) {
+ destDesc = destDesc + " (" + this.getDestCode$() + ")";
+ }
+ } else {
+ destDesc = "CODE" + " - " + this.getDestCode$();
+ }
+ return destDesc;
+ }
}
--
Gitblit v1.9.1