From 1da741e8519e13d8f92824bf8ef15b92800b70fc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期六, 28 六月 2025 16:27:30 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 6f11eef..af1c34c 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
@@ -116,6 +116,12 @@
private Long oriCode;
/**
+ * 璧峰宸烽亾鍝堝笇
+ */
+ @ApiModelProperty(value= "璧峰宸烽亾鍝堝笇")
+ private String oriLaneHash;
+
+ /**
* 鐩爣绔�
*/
@ApiModelProperty(value= "鐩爣绔�")
@@ -132,6 +138,12 @@
*/
@ApiModelProperty(value= "鐩爣鐮�")
private Long destCode;
+
+ /**
+ * 鐩爣宸烽亾鍝堝笇
+ */
+ @ApiModelProperty(value= "鐩爣宸烽亾鍝堝笇")
+ private String destLaneHash;
/**
* 绌烘澘
@@ -388,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;
}
@@ -402,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