From c7d036d6ba067fb90e53a56a400695d991101d89 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 03 七月 2025 15:20:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index f33acd0..4c3374f 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.*;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -370,7 +371,7 @@
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
}
- return null;
+ return this.locNo;
}
public String getStaNo$(){
@@ -397,7 +398,7 @@
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
}
- return null;
+ return this.sourceLocNo;
}
public String getIoTime$(){
@@ -481,12 +482,12 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
- public void setErrorMemo(String errorMemo) {
- if (errorMemo.length() > 255) {
- errorMemo = errorMemo.substring(0, 150);
- }
- this.errorMemo = errorMemo;
- }
+// public void setErrorMemo(String errorMemo) {
+// if (errorMemo.length() > 255) {
+// errorMemo = errorMemo.substring(0, 150);
+// }
+// this.errorMemo = errorMemo;
+// }
public String getLogErrTime$(){
if (Cools.isEmpty(this.logErrTime)){
@@ -495,6 +496,19 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
+ public Long getWrkStsComplete(){
+ if (Cools.isEmpty(this.wrkSts)){
+ return this.wrkSts;
+ }
+ if (this.ioType>10){
+ return this.wrkSts+2;
+ }else {
+ return this.wrkSts+2;
+ }
+ }
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
--
Gitblit v1.9.1