From c1c9f02d25ea862802f727a1f329be6c6f02f637 Mon Sep 17 00:00:00 2001
From: hmpc <hmpc>
Date: 星期日, 03 十一月 2024 15:32:18 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/WrkMast.java |   47 +++++++++++++++++++----------------------------
 1 files changed, 19 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 0000091..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")
@@ -74,6 +74,9 @@
     @TableField("rgv_no")
     private Integer rgvNo;
 
+    /**
+     * 寰愬伐姹変簯鎷嗗灈鏍囪  0: 鍒濆 1銆佹湭鎷嗗凡涓婃姤  2: 宸叉媶  3:宸插鐞嗗彲涓嬩竴姝ワ紙杞巻鍙叉。锛�
+     */
     @ApiModelProperty(value= "")
     @TableField("sheet_no")
     private String sheetNo;
@@ -329,6 +332,13 @@
     @TableField("full_plt")
     private String fullPlt;
 
+    /**
+     * 浼寸敓宸ヤ綔鍙�
+     */
+    @ApiModelProperty(value= "浼寸敓宸ヤ綔鍙�")
+    @TableField("work_no_other")
+    private Integer workNoOther;
+
     public String getWrkSts$(){
         BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
         BasWrkStatus entity = mapper.selectById(this.wrkSts);
@@ -354,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$(){
@@ -393,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;
     }
@@ -505,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