From ad9e95343ccec55d45d73d9e814b7c68ac38e9ca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 05 八月 2025 10:55:11 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index acdcd54..c049038 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= "鍗曚綅")
@@ -128,7 +128,7 @@
     @TableField("dead_time")
     private String deadTime;
 
-    @ApiModelProperty(value= "棰勮澶╂暟")
+    @ApiModelProperty(value= "鐞嗚揣鏍囪瘑 0鏈悊璐э紝1鐞嗚揣涓紝2鐞嗚揣瀹屾垚")
     @TableField("dead_warn")
     private Integer deadWarn;
 
@@ -188,6 +188,20 @@
         }
     }
 
+    public String getDeadWarn$(){
+        if (null == this.deadWarn){ return "鏈悊璐�"; }
+        switch (this.deadWarn){
+            case 0:
+                return "鏈悊璐�";
+            case 1:
+                return "鐞嗚揣涓�";
+            case 2:
+                return "宸茬悊璐�";
+            default:
+                return String.valueOf(this.beBatch);
+        }
+    }
+
     public String getSource$(){
         if (null == this.source){ return null; }
         switch (this.source){

--
Gitblit v1.9.1