From ed8bd2cd2634798298e90cf075a67173b154f0fa Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 18 八月 2025 14:19:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |   54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 7e157b8..c049038 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -4,8 +4,10 @@
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
+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.LocMastService;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
@@ -35,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= "鍗曚綅")
@@ -80,7 +82,7 @@
     @ApiModelProperty(value= "鏉＄爜")
     private String barcode;
 
-    @ApiModelProperty(value= "浜у湴")
+    @ApiModelProperty(value= "浜у湴  浣嶇疆")
     private String origin;
 
     @ApiModelProperty(value= "鍘傚")
@@ -126,7 +128,7 @@
     @TableField("dead_time")
     private String deadTime;
 
-    @ApiModelProperty(value= "棰勮澶╂暟")
+    @ApiModelProperty(value= "鐞嗚揣鏍囪瘑 0鏈悊璐э紝1鐞嗚揣涓紝2鐞嗚揣瀹屾垚")
     @TableField("dead_warn")
     private Integer deadWarn;
 
@@ -158,6 +160,13 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    /**
+     * 鍗蜂俊鎭疘D
+     */
+    @ApiModelProperty(value= "鍗蜂俊鎭疘D")
+    @TableField("roll_up")
+    private Long rollUp;
+
     public String getLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
         LocMast locMast = service.selectById(this.locNo);
@@ -174,6 +183,20 @@
                 return "鏄�";
             case 0:
                 return "鍚�";
+            default:
+                return String.valueOf(this.beBatch);
+        }
+    }
+
+    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);
         }
@@ -226,6 +249,15 @@
         return null;
     }
 
+    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;
+    }
+
     public String getModiTime$(){
         if (Cools.isEmpty(this.modiTime)){
             return "";

--
Gitblit v1.9.1