From e4a7d5239f176c5cf5ba95b52c88366908d2ecfa Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期三, 16 七月 2025 15:30:00 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |   48 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 0556824..fdc0ef2 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;
@@ -16,6 +18,7 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("asr_loc_detl")
@@ -35,33 +38,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("绠卞彿")
     private String batch;
 
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
-    @ExcelProperty("鍗曟嵁缂栧彿")
+//    @ExcelProperty("鍗曟嵁缂栧彿")
     @TableField("order_no")
     private String orderNo;
 
-    @ApiModelProperty(value= "瑙勬牸")
-    private String specs;
-
-    @ApiModelProperty(value= "鍨嬪彿")
+    @ApiModelProperty(value= "鍗峰彿")
     private String model;
 
     @ApiModelProperty(value= "棰滆壊")
     private String color;
 
-    @ApiModelProperty(value= "鍝佺墝")
+    @ApiModelProperty(value= "鏈ㄧ绫诲瀷")
+    @ExcelProperty("鏈ㄧ绫诲瀷")
     private String brand;
 
     @ApiModelProperty(value= "鍗曚綅")
@@ -79,7 +83,7 @@
     @ApiModelProperty(value= "鏉$爜")
     private String barcode;
 
-    @ApiModelProperty(value= "浜у湴")
+    @ApiModelProperty(value= "浜у湴  浣嶇疆")
     private String origin;
 
     @ApiModelProperty(value= "鍘傚")
@@ -157,6 +161,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);
@@ -208,9 +219,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);
         }
@@ -225,6 +238,15 @@
         return null;
     }
 
+    public String getBrand$(){
+        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+        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;
+    }
+
     public String getModiTime$(){
         if (Cools.isEmpty(this.modiTime)){
             return "";

--
Gitblit v1.9.1