From 6252866f7c1288635d69c61c5dad369924d5a8f2 Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Wed, 19 Aug 2026 15:29:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(oms):=E6=98=8E=E7=BB=86=E8=A1=A8=E4=BF=9D?=
 =?UTF-8?q?=E9=A2=9D=E8=B4=A7=E7=89=A9=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/po/ExecutionInMaterialDetailPO.java        | 8 ++++++++
 .../executionInMaterialDetailMapper.xml                   | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailPO.java
index 6a1a637c4..86be848a0 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailPO.java
@@ -495,4 +495,12 @@ public class ExecutionInMaterialDetailPO extends ExecutionStockInOrderBasePO {
     //申报总价
     private BigDecimal amountGw;
     private String khdm;
+
+    @ApiModelProperty("保额")
+    @Excel(name = "保额")
+    private BigDecimal insureAmount;
+
+    @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型")
+    private Integer goodsType;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml
index 82b62fb9c..cb7efac12 100644
--- a/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml
@@ -97,6 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="erpCurrGw"    column="erp_curr_gw"    />
         <result property="erpPriceGw"    column="erp_price_gw"    />
         <result property="amountGw"    column="amount_gw"    />
+        <result property="insureAmount"    column="insure_amount"    />
+        <result property="goodsType"    column="goods_type"    />
     </resultMap>
 
 
@@ -401,6 +403,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.single_volume, a.single_gross_weight, a.lot_no,
         a.drink_date, a.fire_insure_fee, a.unit_price,
         a.line_num_gw, a.spec_gw, a.unit_gw, a.qty_gw, a.erp_curr_gw, a.erp_price_gw, a.amount_gw,
+        c.insure_amount, c.goods_type,
         b.shipper_id as order_shipper_id,
         b.shipper_code as order_shipper_code,
         b.shipper_name as order_shipper_name,
@@ -409,6 +412,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         b.warehouse_date
         from execution_in_material_detail a
         left join execution_stock_in_order b on a.in_order_number = b.in_order_number
+        left join material_base_info c on a.material_base_info_id = c.material_base_info_id
         <where>
             <if test="organizationId != null ">
                 and a.organization_id = #{organizationId}