From eb894e3c1dde980cb6cbaf559782bedb801db2ca Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 25 四月 2025 10:44:19 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |   57 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index bd7eab3..03aa67d 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -4,9 +4,12 @@
 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;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,33 +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("绠卞彿")
     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= "鍗曚綅")
@@ -78,7 +82,7 @@
     @ApiModelProperty(value= "鏉＄爜")
     private String barcode;
 
-    @ApiModelProperty(value= "浜у湴")
+    @ApiModelProperty(value= "浜у湴  浣嶇疆")
     private String origin;
 
     @ApiModelProperty(value= "鍘傚")
@@ -132,7 +136,7 @@
     private Integer source;
 
     @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
-    private Integer check;
+    private Integer inspect;
 
     @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
     private Integer danger;
@@ -155,6 +159,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);
@@ -191,15 +202,15 @@
         }
     }
 
-    public String getCheck$(){
-        if (null == this.check){ return null; }
-        switch (this.check){
+    public String getInspect$(){
+        if (null == this.inspect){ return null; }
+        switch (this.inspect){
             case 1:
                 return "鏄�";
             case 0:
                 return "鍚�";
             default:
-                return String.valueOf(this.check);
+                return String.valueOf(this.inspect);
         }
     }
 
@@ -224,13 +235,21 @@
         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 "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
     }
-
 
     public String getAppeUser$(){
         UserService service = SpringUtils.getBean(UserService.class);
@@ -248,4 +267,8 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
+    public void sync(Object source) {
+        Synchro.Copy(source, this);
+    }
+
 }

--
Gitblit v1.9.1