From e9c912f6b75360f5380579e4ed574f490ecd6d9e Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 17:22:01 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/WaitPakin.java |   54 +++++++++++++++++++++++++++++++++---------------------
 1 files changed, 33 insertions(+), 21 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..c24dd70 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -2,14 +2,14 @@
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
-import com.core.exception.CoolException;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasBoxTypeService;
+import com.zy.common.utils.Synchro;
 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;
@@ -36,6 +36,9 @@
     @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
     private String maktx;
 
+    /*
+     * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠辩紪鐮�
+     * */
     @ApiModelProperty(value= "鎵瑰彿")
     private String batch;
 
@@ -46,12 +49,18 @@
     @ApiModelProperty(value= "瑙勬牸")
     private String specs;
 
+    /*
+     * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭壒娆�
+     * */
     @ApiModelProperty(value= "鍨嬪彿")
     private String model;
 
     @ApiModelProperty(value= "棰滆壊")
     private String color;
 
+    /*
+     * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠辩被鍨�
+     * */
     @ApiModelProperty(value= "鍝佺墝")
     private String brand;
 
@@ -70,6 +79,9 @@
     @ApiModelProperty(value= "鏉＄爜")
     private String barcode;
 
+    /*
+     * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠变綅缃�
+     * */
     @ApiModelProperty(value= "浜у湴")
     private String origin;
 
@@ -155,6 +167,13 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    /**
+     * 鍗蜂俊鎭疘D
+     */
+    @ApiModelProperty(value= "鍗蜂俊鎭疘D")
+    @TableField("roll_up")
+    private Long rollUp;
+
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
         switch (this.beBatch){
@@ -219,23 +238,16 @@
         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);
     }
 
+    public String getBrand$(){
+        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+        BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
+        if (!Cools.isEmpty(basBoxType)){
+            return String.valueOf(basBoxType.getBoxSpecs());
+        }
+        return this.brand;
+    }
 }

--
Gitblit v1.9.1