From e18828825efe043781ed884513e5e4e5b2dffcbe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 12 七月 2021 16:51:15 +0800
Subject: [PATCH] # webservice demo 模块

---
 src/main/java/com/zy/asrs/entity/WrkDetlLog.java |   66 +++++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index d3d976e..d44e473 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -31,46 +34,53 @@
     private Date ioTime;
 
     /**
-     * 鐗╂枡缂栧彿
+     * 浜у搧
      */
-    @ApiModelProperty(value= "鐗╂枡缂栧彿")
+    @ApiModelProperty(value= "浜у搧")
     private String matnr;
+
+    /**
+     * 浜у搧鎻忚堪
+     */
+    @ApiModelProperty(value= "浜у搧鎻忚堪")
+    private String maktx;
+
 
     /**
      * 浠撳簱鍙�
      */
-    @ApiModelProperty(value= "浠撳簱鍙�")
+    @ApiModelProperty(value= "瑙勬牸")
     private String lgnum;
 
     /**
-     * 杞偍璇锋眰缂栧彿
+     * 浠撳簱鍙�
      */
-    @ApiModelProperty(value= "杞偍璇锋眰缂栧彿")
-    private Integer tbnum;
+    @ApiModelProperty(value= "浜у搧绫诲埆")
+    private String type;
 
     /**
-     * 琛岄」鐩�
+     * 浠撳簱鍙�
      */
-    @ApiModelProperty(value= "琛岄」鐩�")
-    private Integer tbpos;
+    @ApiModelProperty(value= "棰滆壊")
+    private String color;
 
     /**
-     * 鐗╂枡鏍囩ID
+     * 浠撳簱鍙�
      */
-    @ApiModelProperty(value= "鐗╂枡鏍囩ID")
-    private String zmatid;
+    @ApiModelProperty(value= "渚涘簲鍟�")
+    private String supplier;
 
     /**
-     * 鐗╂枡鎻忚堪
+     * 浠撳簱鍙�
      */
-    @ApiModelProperty(value= "鐗╂枡鎻忚堪")
-    private String maktx;
+    @ApiModelProperty(value= "浠撳簱")
+    private String warehouse;
 
     /**
-     * 宸ュ巶
+     * 浠撳簱鍙�
      */
-    @ApiModelProperty(value= "宸ュ巶")
-    private String werks;
+    @ApiModelProperty(value= "鍝佺墝")
+    private String brand;
 
     /**
      * 鏁伴噺
@@ -130,8 +140,6 @@
     @TableField("appe_time")
     private Date appeTime;
 
-    @ApiModelProperty(value= "")
-    private Double nista;
 
     public String getIoTime$(){
         if (Cools.isEmpty(this.ioTime)){
@@ -140,6 +148,15 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
     }
 
+    public String getModiUser$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.modiUser);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getUsername());
+        }
+        return null;
+    }
+
     public String getModiTime$(){
         if (Cools.isEmpty(this.modiTime)){
             return "";
@@ -147,6 +164,15 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
     }
 
+    public String getAppeUser$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.selectById(this.appeUser);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getUsername());
+        }
+        return null;
+    }
+
     public String getAppeTime$(){
         if (Cools.isEmpty(this.appeTime)){
             return "";

--
Gitblit v1.9.1