From 8b9bc3962f02f2739b20b1772f92a1f8e3072b06 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 28 十月 2025 17:18:06 +0800
Subject: [PATCH] *30===>10
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index c24dd70..ffa9f01 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")
@@ -67,7 +68,7 @@
@ApiModelProperty(value= "鍗曚綅")
private String unit;
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value= "鍗曚环 闀垮害")
private Double price;
@ApiModelProperty(value= "sku")
@@ -106,7 +107,7 @@
@ApiModelProperty(value= "闀垮害")
private Double length;
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value= "浣撶Н 姣涢噸")
private Double volume;
@ApiModelProperty(value= "涓夋柟缂栫爜")
@@ -216,9 +217,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);
}
@@ -244,8 +247,8 @@
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;
--
Gitblit v1.9.1