From 16daa2a44e5fa705e671f5ff18631eb26ad70d40 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 18 二月 2024 14:24:34 +0800
Subject: [PATCH] 库区管理bug修复

---
 src/main/java/com/zy/asrs/entity/Pla.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 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 209dd5e..45cd619 100644
--- a/src/main/java/com/zy/asrs/entity/Pla.java
+++ b/src/main/java/com/zy/asrs/entity/Pla.java
@@ -214,7 +214,7 @@
 
     //搴撲綅
     @TableField("loc_no")
-    //@ExcelProperty(value = "搴撲綅")
+    @ExcelProperty(value = "搴撲綅")
     private String locNo;
 
     //鐘舵��
@@ -261,10 +261,33 @@
     @TableField("memo")
     private String memo;
 
+    @TableField("stock_freeze")
+    private int 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 getPakinTime$() {
         if (Cools.isEmpty(this.pakinTime)){
             return "";
         }
-        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.pakinTime);
+        return new SimpleDateFormat("yyyy-MM-dd HH").format(this.pakinTime);
+    }
+
+    public String getStockFreezeDate$() {
+        if (Cools.isEmpty(this.stockFreezeDate)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(this.stockFreezeDate);
     }
 }

--
Gitblit v1.9.1