From dc9228656b202a8f1ec7720d78eb0421a94a28c9 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 23 十月 2025 16:20:14 +0800
Subject: [PATCH] 聚乳酸明细增加丙交酯含量,%指标
---
src/main/java/com/zy/asrs/entity/Pla.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Pla.java b/src/main/java/com/zy/asrs/entity/Pla.java
index e3029ec..cb0f6e7 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 = "鐢熶骇鏃ユ湡")
@@ -133,6 +148,10 @@
@TableField("opacity")
@ExcelProperty(value = "涓嶉�忔槑搴�,%")
private Double opacity;
+
+ @TableField("lactide_content")
+ @ExcelProperty(value = "涓欎氦閰惈閲�,%")
+ private Double lactideContent;
//L鍊�
@TableField("l")
@@ -223,7 +242,7 @@
//姝ラ
@TableField("step")
- private int step;
+ private Integer step;
@TableField("create_time")
private Date createTime;
@@ -262,13 +281,34 @@
private String memo;
@TableField("stock_freeze")
- private int stockFreeze;
+ 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)){
@@ -281,6 +321,6 @@
if (Cools.isEmpty(this.stockFreezeDate)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd").format(this.stockFreezeDate);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.stockFreezeDate);
}
}
--
Gitblit v1.9.1