From e128bbc4a9df1491257320884169ba813d461f63 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 20 十二月 2025 10:33:20 +0800
Subject: [PATCH] #1

---
 src/main/java/com/zy/asrs/entity/WaitPakin.java |   14 ++++++++++++--
 1 files changed, 12 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 daf8067..976ca55 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -13,6 +13,7 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("cust_wait_pakin")
@@ -246,10 +247,19 @@
 
     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)){
+        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;
     }
+
+    public int getBrandArmType$(){
+        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 basBoxType.getArmType();
+        }
+        return 999;
+    }
 }

--
Gitblit v1.9.1