From ce6bfd4114d69b3fa8f78cd3d4cb1f9acbfca7e8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 29 一月 2021 10:25:27 +0800
Subject: [PATCH] #物料新增

---
 src/main/java/com/zy/asrs/entity/WrkDetlLog.java |   92 +++++++++++++++++++++++++++++----------------
 1 files changed, 59 insertions(+), 33 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..c1bf1f2 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 lgnum;
-
-    /**
-     * 杞偍璇锋眰缂栧彿
-     */
-    @ApiModelProperty(value= "杞偍璇锋眰缂栧彿")
-    private Integer tbnum;
-
-    /**
-     * 琛岄」鐩�
-     */
-    @ApiModelProperty(value= "琛岄」鐩�")
-    private Integer tbpos;
-
-    /**
-     * 鐗╂枡鏍囩ID
-     */
-    @ApiModelProperty(value= "鐗╂枡鏍囩ID")
-    private String zmatid;
 
     /**
      * 鐗╂枡鎻忚堪
      */
-    @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+    @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
     private String maktx;
 
+
     /**
-     * 宸ュ巶
+     * 浠撳簱鍙�
      */
-    @ApiModelProperty(value= "宸ュ巶")
-    private String werks;
+    @ApiModelProperty(value= "瑙勬牸")
+    private String lgnum;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "鍨嬪彿")
+    private String type;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "鏉＄爜")
+    private String color;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "鎵瑰彿")
+    private String supplier;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+    private String warehouse;
+
+    /**
+     * 浠撳簱鍙�
+     */
+    @ApiModelProperty(value= "鍝侀」鏁�")
+    private String brand;
 
     /**
      * 鏁伴噺
@@ -93,7 +103,7 @@
     /**
      * 鐢ㄦ埛ID
      */
-    @ApiModelProperty(value= "鐢ㄦ埛ID")
+    @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
     private String bname;
 
     /**
@@ -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