From a582f5cd87d2ee36b79b9b3ab6de1a7690d3c1cf Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 24 九月 2024 13:26:14 +0800
Subject: [PATCH] *

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

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index c295716..03676d4 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -1,8 +1,13 @@
 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.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +21,7 @@
 
     private static final long serialVersionUID = 1L;
 
+    @TableId("zpallet")
     @ApiModelProperty(value= "鎵樼洏鏉＄爜")
     private String zpallet;
 
@@ -26,12 +32,14 @@
     @TableField("loc_no")
     private String locNo;
 
+    @TableId("matnr")
     @ApiModelProperty(value= "鍟嗗搧缂栧彿")
     private String matnr;
 
     @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
     private String maktx;
 
+    @TableId("batch")
     @ApiModelProperty(value= "鎵瑰彿")
     private String batch;
 
@@ -48,7 +56,8 @@
     @ApiModelProperty(value= "棰滆壊")
     private String color;
 
-    @ApiModelProperty(value= "鍝佺墝")
+    @ApiModelProperty(value= "绫诲瀷")
+//    @ApiModelProperty(value= "鍝佺墝")
     private String brand;
 
     @ApiModelProperty(value= "鍗曚綅")
@@ -120,7 +129,7 @@
     private Integer source;
 
     @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
-    private Integer check;
+    private Integer inspect;
 
     @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
     private Integer danger;
@@ -151,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){
@@ -177,15 +194,15 @@
         }
     }
 
-    public String getCheck$(){
-        if (null == this.check){ return null; }
-        switch (this.check){
+    public String getInspect$(){
+        if (null == this.inspect){ return null; }
+        switch (this.inspect){
             case 1:
                 return "鏄�";
             case 0:
                 return "鍚�";
             default:
-                return String.valueOf(this.check);
+                return String.valueOf(this.inspect);
         }
     }
 
@@ -215,4 +232,16 @@
         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