From 06cf5ce8619b8ff3e8a8dd5974d191eea09834de Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Fri, 28 Aug 2026 16:22:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(oms):=E6=98=8E=E7=BB=86=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../po/ExecutionOutMaterialDetailWithOrderPO.java          | 7 +++++++
 .../ExecutionOutMaterialDetailMapper.xml                   | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/po/ExecutionOutMaterialDetailWithOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/po/ExecutionOutMaterialDetailWithOrderPO.java
index 6cc1c9823..8534f26b5 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/po/ExecutionOutMaterialDetailWithOrderPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/po/ExecutionOutMaterialDetailWithOrderPO.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -41,4 +42,10 @@ public class ExecutionOutMaterialDetailWithOrderPO extends ExecutionOutMaterialD
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date orderOutboundTime;
+
+    @ApiModelProperty("保额")
+    private BigDecimal insureAmount;
+
+    @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
+    private Integer goodsType;
 }
diff --git a/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml
index 8fd4090a8..6f7068f7a 100644
--- a/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml
@@ -459,6 +459,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderShipperName"    column="order_shipper_name"    />
         <result property="orderOutboundDate"   column="order_outbound_date"   />
         <result property="orderOutboundTime"   column="order_outbound_time"   />
+        <result property="insureAmount"        column="insure_amount"         />
+        <result property="goodsType"           column="goods_type"            />
     </resultMap>
 
     <select id="queryOutOrderDetailList"
@@ -493,6 +495,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.stock_unit, a.stock_quantity, a.inventory_quantity,
             a.line_num_gw, a.spec_gw, a.unit_gw, a.qty_gw,
             a.erp_curr_gw, a.erp_price_gw, a.amount_gw, a.in_order_number_gw, a.in_line_num_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,
@@ -502,6 +505,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.audit_status as out_order_audit_status
         from execution_out_material_detail a
         left join execution_stock_out_order b on a.out_order_number = b.out_order_number
+        left join NGWL_TEST_WMS.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}