From 134dce5c589094fdad6c572fd56770922d9692a9 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 10 七月 2025 21:31:59 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/OrderDetl.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 810a74b..407fdbc 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -4,8 +4,10 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+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.asrs.service.OrderService;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
@@ -17,6 +19,7 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("man_order_detl")
@@ -471,7 +474,7 @@
     }
 
     public String getQty$(){
-        if (getAnfme().equals(getQty())){
+        if (this.anfme.equals(this.qty)){
             return "宸插畬鎴�";
         }
         return "鏈畬鎴�";
@@ -491,4 +494,13 @@
         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;
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.1