From 7a3227174bde55918aef6f411489d0dd24c3b129 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 21 十二月 2024 14:09:46 +0800
Subject: [PATCH] 工作历史档可搜索返修品

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

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index d6459bb..4bae423 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -2,7 +2,10 @@
 
 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.common.SpringUtils;
+import com.zy.asrs.service.BasBoxTypeService;
 import com.zy.common.utils.Synchro;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -64,7 +67,7 @@
     @ApiModelProperty(value= "鍗曚綅")
     private String unit;
 
-    @ApiModelProperty(value= "鍗曚环")
+    @ApiModelProperty(value= "鍗曚环 闀垮害")
     private Double price;
 
     @ApiModelProperty(value= "sku")
@@ -103,7 +106,7 @@
     @ApiModelProperty(value= "闀垮害")
     private Double length;
 
-    @ApiModelProperty(value= "浣撶Н")
+    @ApiModelProperty(value= "浣撶Н  姣涢噸")
     private Double volume;
 
     @ApiModelProperty(value= "涓夋柟缂栫爜")
@@ -163,6 +166,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; }
@@ -231,4 +241,13 @@
     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