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 | 203 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 177 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Pla.java b/src/main/java/com/zy/asrs/entity/Pla.java
index e55fe3e..55dc517 100644
--- a/src/main/java/com/zy/asrs/entity/Pla.java
+++ b/src/main/java/com/zy/asrs/entity/Pla.java
@@ -1,13 +1,16 @@
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
import java.util.Date;
@Data
@@ -19,111 +22,215 @@
//鍏ュ簱鏃堕棿
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("pakin_time")
- private String pakinTime;
+ private Date pakinTime;
- //鎵瑰彿
- @TableField("batch")
- private String batch;
+ //涓讳綋
+ @ExcelProperty(value = "涓讳綋")
+ @TableField("owner")
+ private String owner;
- //鍖呰鍙�
- @TableField("package_no")
- private String packageNo;
+ //涓讳綋
+ @ExcelProperty(value = "鐗╄祫绫诲埆")
+ @TableField("type")
+ private String type;
- //鐗屽彿
- @TableField("brand")
- private String brand;
-
- //閲嶉噺
- @TableField("weight")
- private Double weight;
+ //鐢熶骇璁㈠崟缂栧彿
+ @ExcelProperty(value = "鐢熶骇璁㈠崟缂栧彿")
+ @TableField("pro_order_no")
+ private String proOrderNo;
//杞﹂棿
+ @ExcelProperty(value = "鐢熶骇杞﹂棿")
@TableField("workshop")
private String workshop;
//鐢熶骇绾�
+ @ExcelProperty(value = "鐢熶骇绾�")
@TableField("line")
private String line;
+ //鐢熶骇绾�
+ @ExcelProperty(value = "瀛樿揣缂栫爜")
+ @TableField("matnr")
+ private String matnr;
+
+ //鐗屽彿
+ @ExcelProperty(value = "鐗屽彿")
+ @TableField("brand")
+ private String brand;
+
+ //鎵瑰彿
+ @TableField("batch")
+ @ExcelProperty(value = "鎵瑰彿")
+ private String batch;
+
+ //鍖呰鍙�
+ @TableField("package_no")
+ @ExcelProperty(value = "鍖呰鍙�")
+ 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 = "鐢熶骇鏃ユ湡")
+ @TableField("pro_date")
+ private String proDate;
+
+ //閲嶉噺
+ @TableField("weight")
+ @ExcelProperty(value = "閲嶉噺KG")
+ private Double weight;
+
+ @ApiModelProperty(value= "鍗曚綅")
+ //@ExcelProperty(value = "鍗曚綅")
+ @TableField("unit")
+ private String unit;
+
//鍖呰绫诲瀷
@TableField("package_type")
+ @ExcelProperty(value = "鍖呰绫诲瀷")
private String packageType;
//鎵樼洏绫诲瀷
@TableField("zpallet_type")
+ @ExcelProperty(value = "鎵樼洏绫诲瀷")
private String zpalletType;
//缂犺啘
@TableField("film_wrap")
+ @ExcelProperty(value = "缂犺啘")
private String filmWrap;
//鐔旀寚
@TableField("finger_melting")
+ @ExcelProperty(value = "鐔旀寚,g/10min")
private Double fingerMelting;
+
+ //姘村垎
+ @TableField("water")
+ @ExcelProperty(value = "姘村垎,ppm")
+ private Double water;
//鐔旂偣
@TableField("fusing_point")
+ @ExcelProperty(value = "鐔旂偣,鈩�")
private Double fusingPoint;
//鎸ュ彂浠�1
@TableField("vadf1")
+ @ExcelProperty(value = "鎸ュ彂娈�,%")
private Double vadf1;
//鎸ュ彂浠�2
@TableField("vadf2")
+ @ExcelProperty(value = "鍒嗚В娈�,%")
private Double vadf2;
//榛勫害
@TableField("yellowness")
+ @ExcelProperty(value = "榛勫害")
private Double yellowness;
//涓嶉�忔槑搴�
@TableField("opacity")
+ @ExcelProperty(value = "涓嶉�忔槑搴�,%")
private Double opacity;
-
- //姘村垎
- @TableField("water")
- private Double water;
//L鍊�
@TableField("l")
+ @ExcelProperty(value = "L*")
private Double l;
//a鍊�
@TableField("a")
+ @ExcelProperty(value = "a*")
private Double a;
//b鍊�
@TableField("b")
+ @ExcelProperty(value = "b*")
private Double b;
//濉厖
@TableField("fill_in")
+ @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 = "璐ㄩ噺鐘舵��")
private String massState;
//璐ㄩ噺闂
@TableField("problem")
+ @ExcelProperty(value = "澶囨敞")
private String problem;
- //浠撳簱
- @TableField("stash")
- private String stash;
+ //搴旂敤鏂瑰悜
+ @ExcelProperty(value = "搴旂敤鏂瑰悜")
+ @TableField("direction")
+ private String direction;
- //搴撲綅
- @TableField("loc_no")
- private String locNo;
+ //瀛樻斁浣嶇疆
+ @ExcelProperty(value = "瀛樻斁浣嶇疆")
+ @TableField("position")
+ private String position;
//鍓╀綑閲嶉噺
@TableField("weight_anfme")
+ @ExcelProperty(value = "鍏ュ簱閲�")
private Double weightAnfme = 0.0;
//寰呭嚭搴撴暟閲�
@TableField("qty_anfme")
private Double qtyAnfme = 0.0;
+
+ //浠撳簱
+ @TableField("stash")
+ //@ExcelProperty(value = "浠撳簱")
+ private String stash;
+
+ //搴撲綅
+ @TableField("loc_no")
+ @ExcelProperty(value = "搴撲綅")
+ private String locNo;
//鐘舵��
@TableField("status")
@@ -131,7 +238,7 @@
//姝ラ
@TableField("step")
- private int step;
+ private Integer step;
@TableField("create_time")
private Date createTime;
@@ -168,4 +275,48 @@
@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