From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:21:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 83298e9..090f397 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;
@@ -159,7 +160,7 @@
@TableField("ctn_type")
private Integer ctnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鐢ㄤ簬鏍囪瘑璺ㄥ簱鎿嶄綔锛�1锛屽爢鍨涙満寰�鍥涘悜搴擄紝2鍥涘悜搴撳線鍫嗗灈鏈�")
private String packed;
@ApiModelProperty(value= "")
@@ -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$(){
@@ -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