From 4db544a99fc9d3f033b020718ac1ac973dec4a0e Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 17 七月 2025 18:46:55 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 4af7c47..b1574a8 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -19,6 +19,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Data
@TableName("man_order_detl")
@@ -420,9 +421,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);
}
@@ -473,7 +476,7 @@
}
public String getQty$(){
- if (getAnfme().equals(getQty())){
+ if (this.anfme.equals(this.qty)){
return "宸插畬鎴�";
}
return "鏈畬鎴�";
@@ -495,11 +498,11 @@
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 null;
+ return this.brand;
}
}
\ No newline at end of file
--
Gitblit v1.9.1