From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java
index 911f182..1260cf4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java
@@ -4,6 +4,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.zy.asrs.common.utils.Synchro;
import com.zy.asrs.wms.asrs.service.TaskStsService;
import com.zy.asrs.wms.asrs.service.TaskTypeService;
import com.zy.asrs.wms.system.entity.Host;
@@ -191,7 +192,7 @@
TaskStsService service = SpringUtils.getBean(TaskStsService.class);
TaskSts taskSts = service.getById(this.taskSts);
if (!Cools.isEmpty(taskSts)){
- return String.valueOf(taskSts.getId());
+ return String.valueOf(taskSts.getTitle());
}
return null;
}
@@ -200,7 +201,7 @@
TaskTypeService service = SpringUtils.getBean(TaskTypeService.class);
TaskType taskType = service.getById(this.taskType);
if (!Cools.isEmpty(taskType)){
- return String.valueOf(taskType.getId());
+ return String.valueOf(taskType.getTitle());
}
return null;
}
@@ -270,5 +271,9 @@
return null;
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
}
--
Gitblit v1.9.1