From d5449236ef0b3adafb3e4cc872f50479efa0ce7b Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 三月 2025 16:10:29 +0800
Subject: [PATCH] 配置信息

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |  290 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 194 insertions(+), 96 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 9899b48..dd37610 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -1,14 +1,13 @@
 package com.zy.asrs.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
 import com.zy.asrs.service.LocMastService;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -22,138 +21,237 @@
 
     private static final long serialVersionUID = 1L;
 
-
-    @ApiModelProperty(value= "搴撲綅鍙�")
-    @TableId(value = "loc_no", type = IdType.INPUT)
+    @ApiModelProperty(value = "搴撲綅鍙�")
     @TableField("loc_no")
     private String locNo;
 
-    @ApiModelProperty(value= "浜у搧缂栫爜")
-    @TableId(value = "mat_no", type = IdType.INPUT)
-    @TableField("mat_no")
-    private String matNo;
-
-    @ApiModelProperty(value= "浜у搧鍚嶇О")
-    @TableId(value = "mat_name")
-    @TableField("mat_name")
-    private String matName;
-
-    @ApiModelProperty(value= "瑙勬牸")
-    private String specs;
-
-    @ApiModelProperty(value= "灏哄")
-    private String size;
-
-    @ApiModelProperty(value= "棰滆壊")
-    private String color;
-
-    @ApiModelProperty(value= "鍗曢噸")
-    private Double weight;
-
-    @ApiModelProperty(value= "渚涘簲鍟�")
-    private String supplier;
-
-    @ApiModelProperty(value= "浠撳簱")
-    private String warehouse;
-
-    @ApiModelProperty(value= "鍝佺墝")
-    private String brand;
-
-    @ApiModelProperty(value= "鏁伴噺")
-    private Double qty;
-
-    @ApiModelProperty(value= "鍗曚綅")
-    private String unit;
-
-    @ApiModelProperty(value= "鎵樼洏鏉$爜")
+    @ApiModelProperty(value = "鎵樼洏鏉$爜")
     private String zpallet;
 
-    @ApiModelProperty(value= "鐢ㄦ埛ID")
-    private String bname;
+    @ApiModelProperty(value = "鏁伴噺")
+    @ExcelProperty("鏁伴噺")
+    private Double anfme;
 
-    @ApiModelProperty(value= "澶囨敞")
-    private String memo;
+    @ApiModelProperty(value = "鍟嗗搧缂栧彿")
+    @ExcelProperty("鍟嗗搧缂栧彿")
+    private String matnr;
 
-    @ApiModelProperty(value= "淇敼浜哄憳")
-    @TableField("modi_user")
-    private Long modiUser;
+    @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+    @ExcelProperty("鍟嗗搧鍚嶇О")
+    private String maktx;
 
-    @ApiModelProperty(value= "淇敼鏃堕棿")
-    @TableField("modi_time")
-    private Date modiTime;
+    @ApiModelProperty(value = "鎵瑰彿")
+    @ExcelProperty("鎵瑰彿")
+    private String batch;
 
-    @ApiModelProperty(value= "鍒涘缓鑰�")
-    @TableField("appe_user")
-    private Long appeUser;
-
-    @ApiModelProperty(value= "娣诲姞鏃堕棿")
-    @TableField("appe_time")
-    private Date appeTime;
-
-    @TableField("bill_no")
-    private String billNo;
-
-    @TableField("seq_no")
-    private int seqNo;
-
-    @TableField("bill_type")
-    private int billType;
-
-    @TableField("object_id")
-    private String objectId;
-
-    @TableField("object_name")
-    private String objectName;
-
-    @TableField("det_id")
-    private int detId;
-
-    @TableId(value = "Item_batch", type = IdType.INPUT)
-    @TableField("Item_batch")
-    private String itemBatch;
-
+    @ApiModelProperty(value = "鍗曟嵁缂栧彿")
+    @ExcelProperty("鍗曟嵁缂栧彿")
     @TableField("order_no")
     private String orderNo;
 
-    public String getLocNo$(){
+    @ApiModelProperty(value = "瑙勬牸")
+    private String specs;
+
+    @ApiModelProperty(value = "鍨嬪彿")
+    private String model;
+
+    @ApiModelProperty(value = "棰滆壊")
+    private String color;
+
+    @ApiModelProperty(value = "鍝佺墝")
+    private String brand;
+
+    @ApiModelProperty(value = "鍗曚綅")
+    private String unit;
+
+    @ApiModelProperty(value = "鍗曚环")
+    private Double price;
+
+    @ApiModelProperty(value = "sku")
+    private String sku;
+
+    @ApiModelProperty(value = "鍗曚綅閲�")
+    private Double units;
+
+    @ApiModelProperty(value = "鏉$爜")
+    private String barcode;
+
+    @ApiModelProperty(value = "浜у湴")
+    private String origin;
+
+    @ApiModelProperty(value = "鍘傚")
+    private String manu;
+
+    @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+    @TableField("manu_date")
+    private String manuDate;
+
+    @ApiModelProperty(value = "鍝侀」鏁�")
+    @TableField("item_num")
+    private String itemNum;
+
+    @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
+    @TableField("safe_qty")
+    private Double safeQty;
+
+    @ApiModelProperty(value = "閲嶉噺")
+    private Double weight;
+
+    @ApiModelProperty(value = "闀垮害")
+    private Double length;
+
+    @ApiModelProperty(value = "浣撶Н")
+    private Double volume;
+
+    @ApiModelProperty(value = "涓夋柟缂栫爜")
+    @TableField("three_code")
+    private String threeCode;
+
+    @ApiModelProperty(value = "渚涘簲鍟�")
+    private String supp;
+
+    @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+    @TableField("supp_code")
+    private String suppCode;
+
+    @ApiModelProperty(value = "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
+    @TableField("be_batch")
+    private Integer beBatch;
+
+    @ApiModelProperty(value = "淇濊川鏈�")
+    @TableField("dead_time")
+    private String deadTime;
+
+    @ApiModelProperty(value = "棰勮澶╂暟")
+    @TableField("dead_warn")
+    private Integer deadWarn;
+
+    @ApiModelProperty(value = "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
+    private Integer source;
+
+    @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
+    private Integer inspect;
+
+    @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
+    private Integer danger;
+
+    @ApiModelProperty(value = "淇敼浜哄憳")
+    @TableField("modi_user")
+    private Long modiUser;
+
+    @ApiModelProperty(value = "淇敼鏃堕棿")
+    @TableField("modi_time")
+    private Date modiTime;
+
+    @ApiModelProperty(value = "鍒涘缓鑰�")
+    @TableField("appe_user")
+    private Long appeUser;
+
+    @ApiModelProperty(value = "娣诲姞鏃堕棿")
+    @TableField("appe_time")
+    private Date appeTime;
+
+    @ApiModelProperty(value = "澶囨敞")
+    private String memo;
+
+    public String getLocNo$() {
         LocMastService service = SpringUtils.getBean(LocMastService.class);
         LocMast locMast = service.selectById(this.locNo);
-        if (!Cools.isEmpty(locMast)){
+        if (!Cools.isEmpty(locMast)) {
             return String.valueOf(locMast.getLocNo());
         }
         return null;
     }
 
-    public String getModiUser$(){
+    public String getBeBatch$() {
+        if (null == this.beBatch) {
+            return null;
+        }
+        switch (this.beBatch) {
+            case 1:
+                return "鏄�";
+            case 0:
+                return "鍚�";
+            default:
+                return String.valueOf(this.beBatch);
+        }
+    }
+
+    public String getSource$() {
+        if (null == this.source) {
+            return null;
+        }
+        switch (this.source) {
+            case 1:
+                return "鍒堕��";
+            case 2:
+                return "閲囪喘";
+            case 3:
+                return "澶栧崗";
+            default:
+                return String.valueOf(this.source);
+        }
+    }
+
+    public String getInspect$() {
+        if (null == this.inspect) {
+            return null;
+        }
+        switch (this.inspect) {
+            case 1:
+                return "鏄�";
+            case 0:
+                return "鍚�";
+            default:
+                return String.valueOf(this.inspect);
+        }
+    }
+
+    public String getDanger$() {
+        if (null == this.danger) {
+            return null;
+        }
+        switch (this.danger) {
+            case 1:
+                return "鏄�";
+            case 0:
+                return "鍚�";
+            default:
+                return String.valueOf(this.danger);
+        }
+    }
+
+    public String getModiUser$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.modiUser);
-        if (!Cools.isEmpty(user)){
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getUsername());
         }
         return null;
     }
 
-    public String getModiTime$(){
-        if (Cools.isEmpty(this.modiTime)){
+    public String getModiTime$() {
+        if (Cools.isEmpty(this.modiTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
     }
 
-
-    public String getAppeUser$(){
+    public String getAppeUser$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.appeUser);
-        if (!Cools.isEmpty(user)){
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getUsername());
         }
         return null;
     }
 
-    public String getAppeTime$(){
-        if (Cools.isEmpty(this.appeTime)){
+    public String getAppeTime$() {
+        if (Cools.isEmpty(this.appeTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
+
+
 }

--
Gitblit v1.9.1