From dea586adf232c722e8d2dfa833c3d7711a1019df Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 02 二月 2026 13:37:04 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/WrkMastLog.java |   81 +++++++++++++++++++++++++++-------------
 1 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 77b7e24..6d90b87 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -328,9 +328,12 @@
 
     public String getWrkNo$(){
         WrkMastService service = SpringUtils.getBean(WrkMastService.class);
-        WrkMast wrkMast = service.selectById(this.wrkNo);
-        if (!Cools.isEmpty(wrkMast)){
-            return String.valueOf(wrkMast.getWrkNo());
+        if (!Cools.isEmpty(this.wrkNo)) {
+            WrkMast wrkMast = service.selectById(this.wrkNo);
+            if (!Cools.isEmpty(wrkMast)){
+                return String.valueOf(wrkMast.getWrkNo());
+            }
+            return String.valueOf(this.wrkNo);
         }
         return null;
     }
@@ -344,9 +347,12 @@
 
     public String getWrkSts$(){
         BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
-        BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
-        if (!Cools.isEmpty(basWrkStatus)){
-            return String.valueOf(basWrkStatus.getWrkDesc());
+        if (!Cools.isEmpty(this.wrkSts)) {
+            BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
+            if (!Cools.isEmpty(basWrkStatus)){
+                return String.valueOf(basWrkStatus.getWrkDesc());
+            }
+            return String.valueOf(this.wrkSts);
         }
         return null;
     }
@@ -357,18 +363,24 @@
 
     public String getIoType$(){
         BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
-        BasWrkIotype basWrkIotype = service.selectById(this.ioType);
-        if (!Cools.isEmpty(basWrkIotype)){
-            return String.valueOf(basWrkIotype.getIoDesc());
+        if (!Cools.isEmpty(this.ioType)) {
+            BasWrkIotype basWrkIotype = service.selectById(this.ioType);
+            if (!Cools.isEmpty(basWrkIotype)){
+                return String.valueOf(basWrkIotype.getIoDesc());
+            }
+            return String.valueOf(this.ioType);
         }
         return null;
     }
 
     public String getCrnNo$(){
         BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
-        BasCrnp basCrnp = service.selectById(this.crnNo);
-        if (!Cools.isEmpty(basCrnp)){
-            return String.valueOf(basCrnp.getCrnNo());
+        if (!Cools.isEmpty(this.crnNo)) {
+            BasCrnp basCrnp = service.selectById(this.crnNo);
+            if (!Cools.isEmpty(basCrnp)){
+                return String.valueOf(basCrnp.getCrnNo());
+            }
+            return String.valueOf(this.crnNo);
         }
         return null;
     }
@@ -382,36 +394,48 @@
 
     public String getLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
-        LocMast locMast = service.selectById(this.locNo);
-        if (!Cools.isEmpty(locMast)){
-            return String.valueOf(locMast.getLocNo());
+        if (!Cools.isEmpty(this.locNo)) {
+            LocMast locMast = service.selectById(this.locNo);
+            if (!Cools.isEmpty(locMast)){
+                return String.valueOf(locMast.getLocNo());
+            }
+            return String.valueOf(this.locNo);
         }
         return null;
     }
 
     public String getStaNo$(){
         BasDevpService service = SpringUtils.getBean(BasDevpService.class);
-        BasDevp basDevp = service.selectById(this.staNo);
-        if (!Cools.isEmpty(basDevp)){
-            return String.valueOf(basDevp.getDevNo());
+        if (!Cools.isEmpty(this.staNo)) {
+            BasDevp basDevp = service.selectById(this.staNo);
+            if (!Cools.isEmpty(basDevp)){
+                return String.valueOf(basDevp.getDevNo());
+            }
+            return String.valueOf(this.staNo);
         }
         return null;
     }
 
     public String getSourceStaNo$(){
         BasDevpService service = SpringUtils.getBean(BasDevpService.class);
-        BasDevp basDevp = service.selectById(this.sourceStaNo);
-        if (!Cools.isEmpty(basDevp)){
-            return String.valueOf(basDevp.getDevNo());
+        if (!Cools.isEmpty(this.sourceStaNo)) {
+            BasDevp basDevp = service.selectById(this.sourceStaNo);
+            if (!Cools.isEmpty(basDevp)){
+                return String.valueOf(basDevp.getDevNo());
+            }
+            return String.valueOf(this.sourceStaNo);
         }
         return null;
     }
 
     public String getSourceLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
-        LocMast locMast = service.selectById(this.sourceLocNo);
-        if (!Cools.isEmpty(locMast)){
-            return String.valueOf(locMast.getLocNo());
+        if (!Cools.isEmpty(this.sourceLocNo)) {
+            LocMast locMast = service.selectById(this.sourceLocNo);
+            if (!Cools.isEmpty(locMast)){
+                return String.valueOf(locMast.getLocNo());
+            }
+            return String.valueOf(this.sourceLocNo);
         }
         return null;
     }
@@ -477,9 +501,12 @@
 
     public String getAppeUser$(){
         UserService service = SpringUtils.getBean(UserService.class);
-        User user = service.selectById(this.appeUser);
-        if (!Cools.isEmpty(user)){
-            return String.valueOf(user.getUsername());
+        if (!Cools.isEmpty(this.appeUser)) {
+            User user = service.selectById(this.appeUser);
+            if (!Cools.isEmpty(user)){
+                return String.valueOf(user.getUsername());
+            }
+            return String.valueOf(this.appeUser);
         }
         return null;
     }

--
Gitblit v1.9.1