From f42ab50e23d905a963218ee05fdf40b7028dfbd0 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 11 十月 2024 20:18:36 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |  426 ++++++++++++++++++++++-------------------------------
 1 files changed, 176 insertions(+), 250 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 852c4d8..03aa67d 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -1,175 +1,171 @@
 package com.zy.asrs.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+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.zy.asrs.service.LocMastService;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
+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;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+@Data
 @TableName("asr_loc_detl")
+@ExcelIgnoreUnannotated
 public class LocDetl implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 搴撲綅鍙�
-     */
     @ApiModelProperty(value= "搴撲綅鍙�")
-    @TableId(value = "loc_no", type = IdType.INPUT)
     @TableField("loc_no")
     private String locNo;
 
-    /**
-     * 鐗╂枡
-     */
-    @ApiModelProperty(value= "鐗╂枡")
-    @TableId(value = "matnr", type = IdType.INPUT)
-    private String matnr;
-
-    /**
-     * 浠撳簱鍙�
-     */
-    @ApiModelProperty(value= "浠撳簱鍙�")
-    private String lgnum;
-
-    /**
-     * 杞偍璇锋眰缂栧彿
-     */
-    @ApiModelProperty(value= "杞偍璇锋眰缂栧彿")
-    private Integer tbnum;
-
-    /**
-     * 琛岄」鐩�
-     */
-    @ApiModelProperty(value= "琛岄」鐩�")
-    private Integer tbpos;
-
-    /**
-     * 鐗╂枡鏍囩ID
-     */
-    @ApiModelProperty(value= "鐗╂枡鏍囩ID")
-    private String zmatid;
-
-    /**
-     * 鐗╂枡鎻忚堪
-     */
-    @ApiModelProperty(value= "鐗╂枡鎻忚堪")
-    private String maktx;
-
-    /**
-     * 宸ュ巶
-     */
-    @ApiModelProperty(value= "宸ュ巶")
-    private String werks;
-
-    /**
-     * 鏁伴噺
-     */
-    @ApiModelProperty(value= "鏁伴噺")
-    private Double anfme;
-
-    /**
-     * 鍗曚綅
-     */
-    @ApiModelProperty(value= "鍗曚綅")
-    private String altme;
-
-    /**
-     * 鎵樼洏鏉$爜
-     */
     @ApiModelProperty(value= "鎵樼洏鏉$爜")
     private String zpallet;
 
-    /**
-     * 鐢ㄦ埛ID
-     */
-    @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= "鍟嗗搧鍚嶇О")
+    @ExcelProperty("鍟嗗搧鍚嶇О")
+    private String maktx;
+
+    @ApiModelProperty(value= "鎺ュご")
+    private String specs;
+
+    @ApiModelProperty(value= "绠卞彿")
+//    @ExcelProperty("绠卞彿")
+    private String batch;
+
+    @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+//    @ExcelProperty("鍗曟嵁缂栧彿")
+    @TableField("order_no")
+    private String orderNo;
+
+    @ApiModelProperty(value= "鍗峰彿")
+    private String model;
+
+    @ApiModelProperty(value= "棰滆壊")
+    private String color;
+
+    @ApiModelProperty(value= "鏈ㄧ绫诲瀷")
+    @ExcelProperty("鏈ㄧ绫诲瀷")
+    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;
 
-    public LocDetl() {}
+    @ApiModelProperty(value= "澶囨敞")
+    private String memo;
 
-    public LocDetl(String lgnum,Integer tbnum,Integer tbpos,String zmatid,String maktx,String werks,Double anfme,String altme,String zpallet,String bname,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
-        this.lgnum = lgnum;
-        this.tbnum = tbnum;
-        this.tbpos = tbpos;
-        this.zmatid = zmatid;
-        this.maktx = maktx;
-        this.werks = werks;
-        this.anfme = anfme;
-        this.altme = altme;
-        this.zpallet = zpallet;
-        this.bname = bname;
-        this.memo = memo;
-        this.modiUser = modiUser;
-        this.modiTime = modiTime;
-        this.appeUser = appeUser;
-        this.appeTime = appeTime;
-    }
-
-//    LocDetl locDetl = new LocDetl(
-//            null,    // 浠撳簱鍙穂闈炵┖]
-//            null,    // 杞偍璇锋眰缂栧彿[闈炵┖]
-//            null,    // 琛岄」鐩甗闈炵┖]
-//            null,    // 鐗╂枡鏍囩ID[闈炵┖]
-//            null,    // 鐗╂枡鎻忚堪
-//            null,    // 宸ュ巶
-//            null,    // 鏁伴噺
-//            null,    // 鍗曚綅
-//            null,    // 鎵樼洏鏉$爜
-//            null,    // 鐢ㄦ埛ID
-//            null,    // 澶囨敞
-//            null,    // 淇敼浜哄憳
-//            null,    // 淇敼鏃堕棿
-//            null,    // 鍒涘缓鑰�
-//            null    // 娣诲姞鏃堕棿
-//    );
-
-    public String getLocNo() {
-        return locNo;
-    }
+    /**
+     * 鍗蜂俊鎭疘D
+     */
+    @ApiModelProperty(value= "鍗蜂俊鎭疘D")
+    @TableField("roll_up")
+    private Long rollUp;
 
     public String getLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -180,108 +176,54 @@
         return null;
     }
 
-    public void setLocNo(String locNo) {
-        this.locNo = locNo;
+    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 getMatnr() {
-        return matnr;
+    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 void setMatnr(String matnr) {
-        this.matnr = matnr;
+    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 getLgnum() {
-        return lgnum;
-    }
-
-    public void setLgnum(String lgnum) {
-        this.lgnum = lgnum;
-    }
-
-    public Integer getTbnum() {
-        return tbnum;
-    }
-
-    public void setTbnum(Integer tbnum) {
-        this.tbnum = tbnum;
-    }
-
-    public Integer getTbpos() {
-        return tbpos;
-    }
-
-    public void setTbpos(Integer tbpos) {
-        this.tbpos = tbpos;
-    }
-
-    public String getZmatid() {
-        return zmatid;
-    }
-
-    public void setZmatid(String zmatid) {
-        this.zmatid = zmatid;
-    }
-
-    public String getMaktx() {
-        return maktx;
-    }
-
-    public void setMaktx(String maktx) {
-        this.maktx = maktx;
-    }
-
-    public String getWerks() {
-        return werks;
-    }
-
-    public void setWerks(String werks) {
-        this.werks = werks;
-    }
-
-    public Double getAnfme() {
-        return anfme;
-    }
-
-    public void setAnfme(Double anfme) {
-        this.anfme = anfme;
-    }
-
-    public String getAltme() {
-        return altme;
-    }
-
-    public void setAltme(String altme) {
-        this.altme = altme;
-    }
-
-    public String getZpallet() {
-        return zpallet;
-    }
-
-    public void setZpallet(String zpallet) {
-        this.zpallet = zpallet;
-    }
-
-    public String getBname() {
-        return bname;
-    }
-
-    public void setBname(String bname) {
-        this.bname = bname;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getModiUser() {
-        return modiUser;
+    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$(){
@@ -293,12 +235,13 @@
         return null;
     }
 
-    public void setModiUser(Long modiUser) {
-        this.modiUser = modiUser;
-    }
-
-    public Date getModiTime() {
-        return modiTime;
+    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$(){
@@ -306,14 +249,6 @@
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
-    }
-
-    public void setModiTime(Date modiTime) {
-        this.modiTime = modiTime;
-    }
-
-    public Long getAppeUser() {
-        return appeUser;
     }
 
     public String getAppeUser$(){
@@ -325,14 +260,6 @@
         return null;
     }
 
-    public void setAppeUser(Long appeUser) {
-        this.appeUser = appeUser;
-    }
-
-    public Date getAppeTime() {
-        return appeTime;
-    }
-
     public String getAppeTime$(){
         if (Cools.isEmpty(this.appeTime)){
             return "";
@@ -340,9 +267,8 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
-    public void setAppeTime(Date appeTime) {
-        this.appeTime = appeTime;
+    public void sync(Object source) {
+        Synchro.Copy(source, this);
     }
-
 
 }

--
Gitblit v1.9.1