From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

---
 src/main/java/com/zy/asrs/entity/WrkDetlLog.java |   96 ++++++++++++++++++++++++++++-------------------
 1 files changed, 57 insertions(+), 39 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..5d2ed5b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -1,8 +1,12 @@
 package com.zy.asrs.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
 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;
 
@@ -30,59 +34,57 @@
     @TableField("io_time")
     private Date ioTime;
 
+    @ApiModelProperty(value= "浜у搧缂栫爜")
+    @TableId(value = "mat_no")
+    private String matNo;
+
+    @ApiModelProperty(value= "浜у搧鍚嶇О")
+    @TableId(value = "mat_name")
+    private String matName;
+
+    @ApiModelProperty(value= "瑙勬牸")
+    private String specs;
+
+    @ApiModelProperty(value= "灏哄")
+    private String size;
+
+    @ApiModelProperty(value= "棰滆壊")
+    private String color;
+
+    @ApiModelProperty(value= "鍗曢噸")
+    private Double weight;
+
     /**
-     * 鐗╂枡缂栧彿
+     * 鍗曟嵁缂栧彿
      */
-    @ApiModelProperty(value= "鐗╂枡缂栧彿")
-    private String matnr;
+    @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+    @TableField("bill_no")
+    private String billNo;
+
+    /**
+     * 搴忓彿
+     */
+    @ApiModelProperty(value= "搴忓彿")
+    @TableField("seq_no")
+    private String seqNo;
 
     /**
      * 浠撳簱鍙�
      */
-    @ApiModelProperty(value= "浠撳簱鍙�")
-    private String lgnum;
-
-    /**
-     * 杞偍璇锋眰缂栧彿
-     */
-    @ApiModelProperty(value= "杞偍璇锋眰缂栧彿")
-    private Integer tbnum;
-
-    /**
-     * 琛岄」鐩�
-     */
-    @ApiModelProperty(value= "琛岄」鐩�")
-    private Integer tbpos;
-
-    /**
-     * 鐗╂枡鏍囩ID
-     */
-    @ApiModelProperty(value= "鐗╂枡鏍囩ID")
-    private String zmatid;
-
-    /**
-     * 鐗╂枡鎻忚堪
-     */
-    @ApiModelProperty(value= "鐗╂枡鎻忚堪")
-    private String maktx;
-
-    /**
-     * 宸ュ巶
-     */
-    @ApiModelProperty(value= "宸ュ巶")
-    private String werks;
+    @ApiModelProperty(value= "鍝佺墝")
+    private String brand;
 
     /**
      * 鏁伴噺
      */
     @ApiModelProperty(value= "鏁伴噺")
-    private Double anfme;
+    private Double qty;
 
     /**
      * 鍗曚綅
      */
     @ApiModelProperty(value= "鍗曚綅")
-    private String altme;
+    private String unit;
 
     /**
      * 鎵樼洏鏉＄爜
@@ -130,8 +132,6 @@
     @TableField("appe_time")
     private Date appeTime;
 
-    @ApiModelProperty(value= "")
-    private Double nista;
 
     public String getIoTime$(){
         if (Cools.isEmpty(this.ioTime)){
@@ -140,6 +140,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 +156,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