From b3814333d786324bb81cca7d1bcf5ac8f2f1a7cf Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 23 七月 2025 08:35:33 +0800
Subject: [PATCH] 保存一个版本
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 40807f5..5c057d9 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
@@ -74,7 +74,7 @@
private Long agvId;
/**
- * 宸ヤ綔鏃堕棿
+ * 宸ヤ綔鏃堕棿銆佷换鍔″垎閰嶆椂闂�
*/
@ApiModelProperty(value= "宸ヤ綔鏃堕棿")
private Date ioTime;
@@ -400,8 +400,12 @@
if (null != this.oriLoc) {
oriDesc = "LOC" + " - " + this.getOriLoc$();
}
- if (!Cools.isEmpty(oriDesc) && null != this.oriCode) {
- oriDesc = oriDesc + " (" + this.getOriCode$() + ")";
+ if (!Cools.isEmpty(oriDesc)) {
+ if (null != this.oriCode) {
+ oriDesc = oriDesc + " (" + this.getOriCode$() + ")";
+ }
+ } else {
+ oriDesc = "CODE" + " - " + this.getOriCode$();
}
return oriDesc;
}
@@ -414,8 +418,12 @@
if (null != this.destLoc) {
destDesc = "LOC" + " - " + this.getDestLoc$();
}
- if (!Cools.isEmpty(destDesc) && null != this.destCode) {
- destDesc = destDesc + " (" + this.getDestCode$() + ")";
+ if (!Cools.isEmpty(destDesc)) {
+ if (null != this.destCode) {
+ destDesc = destDesc + " (" + this.getDestCode$() + ")";
+ }
+ } else {
+ destDesc = "CODE" + " - " + this.getDestCode$();
}
return destDesc;
}
--
Gitblit v1.9.1