From 78c10abe4faabec66c6e7ba4a8ccb1fd226649fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 6 Feb 2026 15:46:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=B7=BB=E5=8A=A0=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E4=BF=A1=E6=81=AF;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ReceiptMaterialDetail.java         | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java
index 558a6d3bf..f5aa07e43 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java
@@ -3,6 +3,7 @@ package com.mhd.wms.domain.receiptMaterialDetail.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.mhd.common.core.annotation.Excel;
@@ -11,6 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 
 /**
@@ -247,6 +249,37 @@ public class ReceiptMaterialDetail extends BaseVOEntity {
     @Excel(name = "箱号/卡板号")
     private String boxPalletNo;
 
+    @ApiModelProperty("生产日期")
+    @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date productionDate;
+
+    @ApiModelProperty("过期日期")
+    @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date expiryDate;
+
+    @ApiModelProperty("存货日期")
+    @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date inventoryDate;
+
+    @ApiModelProperty("扩展属性1")
+    @Excel(name = "扩展属性1")
+    private String extAttr1;
+
+    @ApiModelProperty("扩展属性2")
+    @Excel(name = "扩展属性2")
+    private String extAttr2;
+
+    @ApiModelProperty("扩展属性3")
+    @Excel(name = "扩展属性3")
+    private String extAttr3;
+
+    @ApiModelProperty("扩展属性4")
+    @Excel(name = "扩展属性4")
+    private String extAttr4;
+
     @ApiModelProperty("申报数量")
     @Excel(name = "申报数量")
     @TableField(exist = false)
@@ -293,4 +326,4 @@ public class ReceiptMaterialDetail extends BaseVOEntity {
     private BigDecimal pieceCount;
 
 
-}
+}
\ No newline at end of file