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 | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 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..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 = "鐢熶骇鏃ユ湡")
@@ -223,7 +238,7 @@
//姝ラ
@TableField("step")
- private int step;
+ private Integer step;
@TableField("create_time")
private Date createTime;
@@ -262,13 +277,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 +317,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