From 035eb4ea58c56ae748b10e4121fc907aa9de62ea Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 30 九月 2024 08:17:23 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/WaitPakin.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index d46b0ea..03676d4 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -4,7 +4,10 @@
 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.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -53,7 +56,8 @@
     @ApiModelProperty(value= "棰滆壊")
     private String color;
 
-    @ApiModelProperty(value= "鍝佺墝")
+    @ApiModelProperty(value= "绫诲瀷")
+//    @ApiModelProperty(value= "鍝佺墝")
     private String brand;
 
     @ApiModelProperty(value= "鍗曚綅")
@@ -156,6 +160,14 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    @ApiModelProperty(value= "bom鍙�")
+    @TableField("bom_code")
+    private String bomCode;
+
+    @ApiModelProperty(value= "bom鍙�")
+    @TableField("is_full")
+    private String isFull;
+
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
         switch (this.beBatch){
@@ -220,6 +232,15 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
+    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 void sync(Object source) {
         Synchro.Copy(source, this);
     }

--
Gitblit v1.9.1