From 77c68b95d72413812021c764bcb39a8f7a3a485c Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Tue, 4 Nov 2025 14:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86-=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=20=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../freeze/domain/BasStockFreezeRecord.java   | 18 ++++++++-----
 .../domain/BasStockMaintainRecord.java        | 26 +++++++++++--------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java
index 248262a..bb8fa38 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java
@@ -1,9 +1,11 @@
 package com.ruoyi.stock.freeze.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -25,14 +27,14 @@ public class BasStockFreezeRecord extends BaseEntity
     private String stockId;
 
     /** 货位编码 */
-    @Excel(name = "${stock.Freeze.cargoSpaceId}")
+    @Excel(name = "货位编码")
     private String cargoSpaceId;
     /** 货位名称 */
-    @Excel(name = "${stock.Freeze.cargoSpaceName}")
+    @Excel(name = "货位名称")
     private String cargoSpaceName;
 
     /** 托盘条码 */
-    @Excel(name = "${stock.Freeze.trayCode}")
+    @Excel(name = "托盘条码")
     private String trayCode;
 
     /** 物品编码 */
@@ -52,11 +54,11 @@ public class BasStockFreezeRecord extends BaseEntity
     private String lotNo;
 
     /** 初始状态 */
-    @Excel(name = "${stock.Freeze.oldStatus}",dictType="stock_status")
+    @Excel(name = "初始状态",dictType="stock_status")
     private String oldStatus;
 
     /** 更改状态 */
-    @Excel(name = "${stock.Freeze.currStatus}",dictType="stock_status")
+    @Excel(name = "更改状态",dictType="stock_status")
     private String currStatus;
 
     /** 操作 */
@@ -64,7 +66,7 @@ public class BasStockFreezeRecord extends BaseEntity
     private String method;
 
     /** 仓库 */
-    @Excel(name = "${stock.Freeze.warehouseId}")
+    @Excel(name = "仓库")
     private String warehouseName;
 
     private String warehouseId;
@@ -89,7 +91,9 @@ public class BasStockFreezeRecord extends BaseEntity
 //    @Excel(name = "${stock.Freeze.productGuid}")
     private String productGuid;
 //    创建时间
-    @Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
+    @Excel(name = "操作时间", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @Override
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java
index 2b131e2..8352542 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java
@@ -1,9 +1,11 @@
 package com.ruoyi.stock.maintain.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -21,26 +23,26 @@ public class BasStockMaintainRecord extends BaseEntity
     private String whGuid;
 
     /** 库存编码 */
-    @Excel(name = "${stock.Maintain.stockId}")
+    @Excel(name = "库存编码")
     private String stockId;
 
     /** 货位编码 */
-    @Excel(name = "${stock.Maintain.cargoSpaceId}")
+    @Excel(name = "货位编码")
     private String cargoSpaceId;
     /** 货位名称 */
-    @Excel(name = "${stock.Maintain.cargoSpaceName}")
+    @Excel(name = "货位名称")
     private String cargoSpaceName;
 
     /** 托盘条码 */
-    @Excel(name = "${stock.Maintain.trayCode}")
+    @Excel(name = "托盘条码")
     private String trayCode;
 
     /** 物品编码 */
-    @Excel(name = "${stock.Maintain.productId}")
+    @Excel(name = "物品编码")
     private String productId;
 
     /** 物品名称 */
-    @Excel(name = "${stock.Maintain.productName}")
+    @Excel(name = "物品名称")
     private String productName;
 
     /** 生产日期 */
@@ -52,23 +54,25 @@ public class BasStockMaintainRecord extends BaseEntity
     private String lotNo;
 
     /** 初始数量 */
-    @Excel(name = "${stock.Maintain.oldQuantity}")
+    @Excel(name = "初始数量")
     private String oldQuantity;
 
     /** 操作后数量 */
-    @Excel(name = "${stock.Maintain.quantity}")
+    @Excel(name = "操作后数量")
     private String quantity;
 
     /** 操作 */
-    @Excel(name = "${stock.Maintain.method}", dictType="stock_maintain_method")
+    @Excel(name = "操作", dictType="stock_maintain_method")
     private String method;
 
     /** 仓库 */
-    @Excel(name = "${stock.Maintain.warehouseId}")
+    @Excel(name = "仓库")
     private String warehouseName;
     private String warehouseId;
 
-    @Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
+    @Excel(name = "操作时间", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @Override