From b2a895946c2e261eec55e6e86daf44fb21825818 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 06 六月 2024 09:30:32 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/Pla.java |  109 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 93 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/Pla.java b/src/main/java/com/zy/asrs/entity/Pla.java
index 9b7a25b..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 = "鐢熶骇鏃ユ湡")
@@ -76,11 +91,11 @@
 
     //閲嶉噺
     @TableField("weight")
-    @ExcelProperty(value = "閲嶉噺")
+    @ExcelProperty(value = "閲嶉噺KG")
     private Double weight;
 
     @ApiModelProperty(value= "鍗曚綅")
-    @ExcelProperty(value = "鍗曚綅")
+    //@ExcelProperty(value = "鍗曚綅")
     @TableField("unit")
     private String unit;
 
@@ -101,27 +116,27 @@
 
     //鐔旀寚
     @TableField("finger_melting")
-    @ExcelProperty(value = "鐔旀寚")
+    @ExcelProperty(value = "鐔旀寚,g/10min")
     private Double fingerMelting;
 
     //姘村垎
     @TableField("water")
-    @ExcelProperty(value = "姘村垎")
+    @ExcelProperty(value = "姘村垎,ppm")
     private Double water;
 
     //鐔旂偣
     @TableField("fusing_point")
-    @ExcelProperty(value = "鐔旂偣")
+    @ExcelProperty(value = "鐔旂偣,鈩�")
     private Double fusingPoint;
 
     //鎸ュ彂浠�1
     @TableField("vadf1")
-    @ExcelProperty(value = "鎸ュ彂浠�1")
+    @ExcelProperty(value = "鎸ュ彂娈�,%")
     private Double vadf1;
 
     //鎸ュ彂浠�2
     @TableField("vadf2")
-    @ExcelProperty(value = "鎸ュ彂浠�2")
+    @ExcelProperty(value = "鍒嗚В娈�,%")
     private Double vadf2;
 
     //榛勫害
@@ -131,32 +146,57 @@
 
     //涓嶉�忔槑搴�
     @TableField("opacity")
-    @ExcelProperty(value = "涓嶉�忔槑搴�")
+    @ExcelProperty(value = "涓嶉�忔槑搴�,%")
     private Double opacity;
 
     //L鍊�
     @TableField("l")
-    @ExcelProperty(value = "l鍊�")
+    @ExcelProperty(value = "L*")
     private Double l;
 
     //a鍊�
     @TableField("a")
-    @ExcelProperty(value = "a鍊�")
+    @ExcelProperty(value = "a*")
     private Double a;
 
     //b鍊�
     @TableField("b")
-    @ExcelProperty(value = "b鍊�")
+    @ExcelProperty(value = "b*")
     private Double b;
 
     //濉厖
     @TableField("fill_in")
-    @ExcelProperty(value = "濉厖")
+    @ExcelProperty(value = "濉厖,%")
     private Double fillIn;
+
+    @ExcelProperty(value = "鎷変几寮哄害,MPa")
+    private String str1;
+
+    @ExcelProperty(value = "鏂浼搁暱鐜�,%")
+    private String str2;
+
+    @ExcelProperty(value = "缂哄彛鍐插嚮,KJ/m2")
+    private String str3;
+
+    @ExcelProperty(value = "缁村崱,鈩�")
+    private String str4;
+
+    @ExcelProperty(value = "鍗婄粨鏅舵椂闂�,min")
+    private String str5;
+
+    @ExcelProperty(value = "缁撴櫠搴�.%")
+    private String str6;
+
+//    @ExcelProperty(value = "濉厖")
+    private String str7;
+//
+//    @ExcelProperty(value = "濉厖")
+    private String str8;
+
 
     //璐ㄩ噺鐘舵��
     @TableField("mass_state")
-    @ExcelProperty(value = "璐ㄩ噺鐘朵綋")
+    @ExcelProperty(value = "璐ㄩ噺鐘舵��")
     private String massState;
 
     //璐ㄩ噺闂
@@ -189,7 +229,7 @@
 
     //搴撲綅
     @TableField("loc_no")
-    //@ExcelProperty(value = "搴撲綅")
+    @ExcelProperty(value = "搴撲綅")
     private String locNo;
 
     //鐘舵��
@@ -198,7 +238,7 @@
 
     //姝ラ
     @TableField("step")
-    private int step;
+    private Integer step;
 
     @TableField("create_time")
     private Date createTime;
@@ -236,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