From 3e9a08ef91a44d8f34b417e0a275c08eca8a043d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Wed, 17 Jun 2026 11:11:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E4=BF=9D=E8=B4=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ReservationInMaterialDetail.java                    | 2 ++
 .../repository/po/ReservationInMaterialDetailPO.java           | 3 ++-
 .../repository/todo/ReservationInMaterialDetailDO.java         | 2 ++
 .../repository/todo/ReservationInMaterialDetailDTO.java        | 2 ++
 .../ReservationInMaterialDetailMapper.xml                      | 3 ++-
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java
index 4b5565509..ce8a63faf 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java
@@ -375,4 +375,6 @@ public class ReservationInMaterialDetail extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
+    @ApiModelProperty("火险保费")
+    private BigDecimal fireInsureFee;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java
index 593aa2958..ca8cf216c 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java
@@ -477,5 +477,6 @@ public class ReservationInMaterialDetailPO extends ReservationStockInOrderBasePO
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
     private String lotNumber;
-
+    @ApiModelProperty("火险保费")
+    private BigDecimal fireInsureFee;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java
index de6340c51..f568ed286 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java
@@ -442,4 +442,6 @@ public class ReservationInMaterialDetailDO extends ReservationStockInOrderBaseDO
     @ApiModelProperty("单价")
     @Excel(name = "单价")
     private BigDecimal unitPrice;
+    @ApiModelProperty("火险保费")
+    private BigDecimal fireInsureFee;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java
index fee306be2..e7ca37b47 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java
@@ -449,4 +449,6 @@ public class ReservationInMaterialDetailDTO extends BaseVOEntity {
     private Date drinkDate;
     private String expiryDate;
     private String productionDate;
+    @ApiModelProperty("火险保费")
+    private BigDecimal fireInsureFee;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/reservationInMaterialDetail/ReservationInMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/reservationInMaterialDetail/ReservationInMaterialDetailMapper.xml
index e0d3c3956..734a29625 100644
--- a/mhd_oms/src/main/resources/mapper/reservationInMaterialDetail/ReservationInMaterialDetailMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationInMaterialDetail/ReservationInMaterialDetailMapper.xml
@@ -89,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="singleGrossWeight"    column="single_gross_weight"    />
         <result property="lotNo"    column="lot_no"    />
         <result property="drinkDate"    column="drink_date"    />
+        <result property="fireInsureFee"    column="fire_insure_fee"    />
     </resultMap>
 
 
@@ -102,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.lot_no ,
         a.material_detail_id, a.organization_id, a.organization_name, a.top_organization_id, a.unique_id, a.in_order_number, a.material_base_info_id,
         a.material_code, a.material_name, a.bar_code, a.quantity, a.receipt_quantity, a.shelves_quantity,
-        a.receipt_status, a.shelves_status, a.pack_id, a.pack_code, a.pack_name,a.drink_date,
+        a.receipt_status, a.shelves_status, a.pack_id, a.pack_code, a.pack_name,a.drink_date,a.fire_insure_fee,
         CASE 
             WHEN a.pack_detail_id IS NULL OR TRIM(a.pack_detail_id) = '' THEN NULL 
             ELSE CAST(a.pack_detail_id AS BIGINT)