From e4a7d5239f176c5cf5ba95b52c88366908d2ecfa Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期三, 16 七月 2025 15:30:00 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/WaitPakin.java |   65 ++++++++++++++++++++------------
 1 files changed, 40 insertions(+), 25 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..ffa9f01 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -2,17 +2,18 @@
 
 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;
+import java.util.List;
 
 @Data
 @TableName("cust_wait_pakin")
@@ -36,6 +37,9 @@
     @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
     private String maktx;
 
+    /*
+     * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠辩紪鐮�
+     * */
     @ApiModelProperty(value= "鎵瑰彿")
     private String batch;
 
@@ -46,19 +50,25 @@
     @ApiModelProperty(value= "瑙勬牸")
     private String specs;
 
+    /*
+     * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭壒娆�
+     * */
     @ApiModelProperty(value= "鍨嬪彿")
     private String model;
 
     @ApiModelProperty(value= "棰滆壊")
     private String color;
 
+    /*
+     * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠辩被鍨�
+     * */
     @ApiModelProperty(value= "鍝佺墝")
     private String brand;
 
     @ApiModelProperty(value= "鍗曚綅")
     private String unit;
 
-    @ApiModelProperty(value= "鍗曚环")
+    @ApiModelProperty(value= "鍗曚环 闀垮害")
     private Double price;
 
     @ApiModelProperty(value= "sku")
@@ -70,6 +80,9 @@
     @ApiModelProperty(value= "鏉＄爜")
     private String barcode;
 
+    /*
+     * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠变綅缃�
+     * */
     @ApiModelProperty(value= "浜у湴")
     private String origin;
 
@@ -94,7 +107,7 @@
     @ApiModelProperty(value= "闀垮害")
     private Double length;
 
-    @ApiModelProperty(value= "浣撶Н")
+    @ApiModelProperty(value= "浣撶Н  姣涢噸")
     private Double volume;
 
     @ApiModelProperty(value= "涓夋柟缂栫爜")
@@ -155,6 +168,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){
@@ -197,9 +217,11 @@
         if (null == this.danger){ return null; }
         switch (this.danger){
             case 1:
-                return "鏄�";
+                return "鍚堟牸";
+            case 2:
+                return "涓嶅悎鏍�";
             case 0:
-                return "鍚�";
+                return "寰呭垽";
             default:
                 return String.valueOf(this.danger);
         }
@@ -219,23 +241,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);
+        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+        for (BasBoxType basBoxType:basBoxTypes){
+            return String.valueOf(basBoxType.getBoxSpecs());
+        }
+        return this.brand;
+    }
 }

--
Gitblit v1.9.1