From 7af1ffdd5af44733dc86a3d03e1f8543e87462d8 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 04 八月 2025 14:43:37 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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..a97aa6a 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;
@@ -395,14 +397,14 @@
}
public String getInspect$(){
- if (null == this.inspect){ return null; }
+ if (null == this.inspect){ return "寰呭璐�"; }
switch (this.inspect){
case 1:
- return "鏄�";
- case 0:
- return "鍚�";
+ return "澶囪揣涓�";
+ case 2:
+ return "宸插璐�";
default:
- return String.valueOf(this.inspect);
+ return "寰呭璐�";
}
}
@@ -415,14 +417,14 @@
}
public String getDanger$(){
- if (null == this.danger){ return null; }
+ if (null == this.danger){ return "寰呯Щ搴�"; }
switch (this.danger){
case 1:
- return "鏄�";
- case 0:
- return "鍚�";
+ return "绉诲簱涓�";
+ case 2:
+ return "绉诲簱瀹屾垚";
default:
- return String.valueOf(this.danger);
+ return "寰呯Щ搴�";
}
}
@@ -491,4 +493,13 @@
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;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1