From e5cf12d2e3441b83cc3aeafd4f7f23d4075ab5fc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 07 一月 2025 14:56:14 +0800
Subject: [PATCH] #并板出库

---
 src/main/java/com/zy/asrs/entity/WrkMast.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 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..cac671e 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$(){
@@ -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