From 731ccdc2b431ca176942daa1bdb0e752ac9bd4f5 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 18 九月 2024 10:40:12 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/Pla.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 55 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/Pla.java b/src/main/java/com/zy/asrs/entity/Pla.java index 209dd5e..55dc517 100644 --- a/src/main/java/com/zy/asrs/entity/Pla.java +++ b/src/main/java/com/zy/asrs/entity/Pla.java @@ -67,7 +67,22 @@ //鍖呰鍙� @TableField("package_no") @ExcelProperty(value = "鍖呰鍙�") - private String packageNo; + private Integer packageNo; + + //鐗屽彿 + @ExcelProperty(value = "鍏宠仈鐗屽彿") + @TableField("new_brand") + private String newBrand; + + //鎵瑰彿 + @TableField("new_batch") + @ExcelProperty(value = "鍏宠仈鎵瑰彿") + private String newBatch; + + //鍖呰鍙� + @TableField("new_package_no") + @ExcelProperty(value = "鍏宠仈鍖呰鍙�") + private Integer newPackageNo; //鍖呰鍙� @ExcelProperty(value = "鐢熶骇鏃ユ湡") @@ -214,7 +229,7 @@ //搴撲綅 @TableField("loc_no") - //@ExcelProperty(value = "搴撲綅") + @ExcelProperty(value = "搴撲綅") private String locNo; //鐘舵�� @@ -223,7 +238,7 @@ //姝ラ @TableField("step") - private int step; + private Integer step; @TableField("create_time") private Date createTime; @@ -261,10 +276,47 @@ @TableField("memo") private String memo; + @TableField("stock_freeze") + private Integer stockFreeze; + + @TableField("stock_freeze_by") + private String stockFreezeBy; + + @TableField("stock_freeze_date") + private Date stockFreezeDate; + + public String getCreateTime$() { + if (Cools.isEmpty(this.createTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd").format(this.createTime); + } + + public String getPackageNo$(){ + if(Cools.isEmpty(packageNo)){ + return null; + } + if(packageNo < 10){ + return "00" + packageNo; + }else if(packageNo < 100){ + return "0" + packageNo; + }else { + return packageNo + ""; + } + + } + public String getPakinTime$() { if (Cools.isEmpty(this.pakinTime)){ return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.pakinTime); } + + public String getStockFreezeDate$() { + if (Cools.isEmpty(this.stockFreezeDate)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.stockFreezeDate); + } } -- Gitblit v1.9.1