From 128cd536ea43da50867353cc19138dbebfe1965b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 21 八月 2024 09:52:57 +0800
Subject: [PATCH] #优化

---
 src/main/java/com/zy/asrs/entity/WrkDetl.java |   24 +++++++++++++++++++++++-
 src/main/webapp/static/js/wrkDetl/wrkDetl.js  |    2 ++
 2 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 707d9ab..064e589 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -2,9 +2,10 @@
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
-import com.zy.asrs.service.LocOwnerService;
+import com.zy.asrs.service.*;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
@@ -384,6 +385,27 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
+    public String getWrkSts$(){
+        WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
+        if (!Cools.isEmpty(this.wrkNo)){
+            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", this.wrkNo));
+            if (!Cools.isEmpty(wrkMast)){
+                return wrkMast.getWrkSts$();
+            }
+        }
+        return null;
+    }
+    public String getIoType$(){
+        WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
+        if (!Cools.isEmpty(this.wrkNo)){
+            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", this.wrkNo));
+            if (!Cools.isEmpty(wrkMast)){
+                return wrkMast.getIoType$();
+            }
+        }
+        return null;
+    }
+
     public void sync(Object source) {
         Synchro.Copy(source, this);
     }
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index 5eb436b..d264887 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -3,6 +3,8 @@
     var cols = [
         {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
         ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width: 160}
+        ,{field: 'wrkSts$', align: 'center',title: '浠诲姟鐘舵��'}
+        ,{field: 'ioType$', align: 'center',title: '浠诲姟绫诲瀷'}
     ];
     cols.push.apply(cols, detlCols);
     cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}

--
Gitblit v1.9.1