From fffcf8f632eb551f11d018184547ce01dcc4907f Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 23 十二月 2024 08:13:58 +0800
Subject: [PATCH] 完善erp上报流程

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

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 168eba7..5739d03 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -1,15 +1,18 @@
 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.baomidou.mybatisplus.enums.IdType;
 import com.core.common.Cools;
-import com.core.exception.CoolException;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
+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;
 
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -20,6 +23,7 @@
 
     private static final long serialVersionUID = 1L;
 
+    @TableId("zpallet")
     @ApiModelProperty(value= "鎵樼洏鏉＄爜")
     private String zpallet;
 
@@ -30,12 +34,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;
 
@@ -155,6 +161,56 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    /**
+     * 鎷ユ湁鑰�
+     */
+    @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠   ")
+    private Integer owner;
+
+    /**
+     * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�
+     */
+    @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
+    private Integer payment;
+
+    /**
+     * uuid鏃堕棿鎴�
+     */
+    @ApiModelProperty(value= "uuid")
+    @TableId(value = "uuid", type = IdType.ID_WORKER_STR)
+    @TableField("uuid")
+    private String uuid;
+
+    public String getUserName$(){
+        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 getOwner$(){
+        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+        LocOwner locOwner = service.selectById(this.owner);
+        if (!Cools.isEmpty(locOwner)){
+            return String.valueOf(locOwner.getOwner());
+        }
+        return null;
+    }
+
+    public String getPayment$(){
+        if (null == this.payment){ return null; }
+        switch (this.payment){
+            case 1:
+                return "浠撳偍";
+            case 0:
+                return "浠ｉ噰";
+            default:
+                return String.valueOf(this.payment);
+        }
+    }
+
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
         switch (this.beBatch){
@@ -219,23 +275,7 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
-    public void sync(Object dest) {
-        try {
-            BeanInfo sourceBean = Introspector.getBeanInfo(this.getClass(),Object.class);
-            PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors();
-            BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class);
-            PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors();
-            for (PropertyDescriptor propertyDescriptor : sourceProperty) {
-                for (PropertyDescriptor descriptor : destProperty) {
-                    if (propertyDescriptor.getName().equals(descriptor.getName()) && propertyDescriptor.getPropertyType() == descriptor.getPropertyType()) {
-                        descriptor.getWriteMethod().invoke(dest, propertyDescriptor.getReadMethod().invoke(this));
-                        break;
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new CoolException("灞炴�у鍒跺け璐�:" + e.getMessage());
-        }
+    public void sync(Object source) {
+        Synchro.Copy(source, this);
     }
-
 }

--
Gitblit v1.9.1