From 050abb296f847e787432197c161f746c128e5956 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 19 十月 2024 13:05:09 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/WrkMast.java |   37 +++++++++----------------------------
 1 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index aaef397..a45aa9e 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -30,7 +30,7 @@
     @ApiModelProperty(value= "宸ヤ綔鍙�")
     @TableId(value = "wrk_no", type = IdType.INPUT)
     @TableField("wrk_no")
-    private Integer wrkNo;
+    private Long wrkNo;
 
     @ApiModelProperty(value= "")
     @TableField("inv_wh")
@@ -364,29 +364,11 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
     }
 
-    public String getCrnNo$(){
-        BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
-        BasCrnp basCrnp = service.selectById(this.crnNo);
-        if (!Cools.isEmpty(basCrnp)){
-            return String.valueOf(basCrnp.getCrnNo());
-        }
-        return null;
-    }
-
     public String getWrkDate$(){
         if (Cools.isEmpty(this.wrkDate)){
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
-    }
-
-    public String getLocNo$(){
-        LocMastService service = SpringUtils.getBean(LocMastService.class);
-        LocMast locMast = service.selectById(this.locNo);
-        if (!Cools.isEmpty(locMast)){
-            return String.valueOf(locMast.getLocNo());
-        }
-        return null;
     }
 
     public String getStaNo$(){
@@ -403,15 +385,6 @@
         BasDevp basDevp = service.selectById(this.sourceStaNo);
         if (!Cools.isEmpty(basDevp)){
             return String.valueOf(basDevp.getDevNo());
-        }
-        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());
         }
         return null;
     }
@@ -515,4 +488,12 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
     }
 
+    public Integer getIoTypeMes$(){
+        if (this.ioType != 101){
+            return 3;
+        } else {
+            return 1;
+        }
+    }
+
 }

--
Gitblit v1.9.1