From e8cf4d70206fb9f4d09a4fc5a23aad2424e1369d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 27 五月 2025 23:35:06 +0800
Subject: [PATCH] 合格
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 13ad69c..c2a38d8 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -37,34 +37,34 @@
@ExcelProperty("鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @ExcelProperty("鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty("瑙勬牸")
private String matnr;
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
@ExcelProperty("鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "瑙勬牸")
- @ExcelProperty("瑙勬牸")
+ @ApiModelProperty(value= "鎺ュご")
private String specs;
- @ApiModelProperty(value= "璐у搧鐗瑰緛")
- @ExcelProperty("璐у搧鐗瑰緛")
+ @ApiModelProperty(value= "绠卞彿")
+// @ExcelProperty("绠卞彿")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @ExcelProperty("鍗曟嵁缂栧彿")
+// @ExcelProperty("鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鍗峰彿")
private String model;
@ApiModelProperty(value= "棰滆壊")
private String color;
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鏈ㄧ绫诲瀷")
+ @ExcelProperty("鏈ㄧ绫诲瀷")
private String brand;
@ApiModelProperty(value= "鍗曚綅")
@@ -218,9 +218,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);
}
@@ -241,7 +243,7 @@
if (!Cools.isEmpty(basBoxType)){
return String.valueOf(basBoxType.getBoxSpecs());
}
- return null;
+ return this.brand;
}
public String getModiTime$(){
--
Gitblit v1.9.1