From 391dd89a6583e0f1eceaf1297fd852e3da32bf68 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 17 四月 2025 16:39:30 +0800
Subject: [PATCH] 出库作业里面显示冻结/未冻结
---
src/main/java/com/zy/asrs/entity/Pla.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Pla.java b/src/main/java/com/zy/asrs/entity/Pla.java
index a1b0d29..55dc517 100644
--- a/src/main/java/com/zy/asrs/entity/Pla.java
+++ b/src/main/java/com/zy/asrs/entity/Pla.java
@@ -69,6 +69,21 @@
@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")
@@ -278,6 +293,9 @@
}
public String getPackageNo$(){
+ if(Cools.isEmpty(packageNo)){
+ return null;
+ }
if(packageNo < 10){
return "00" + packageNo;
}else if(packageNo < 100){
@@ -292,13 +310,13 @@
if (Cools.isEmpty(this.pakinTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH").format(this.pakinTime);
+ 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").format(this.stockFreezeDate);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.stockFreezeDate);
}
}
--
Gitblit v1.9.1