From eb3ada83350bc34c58bc70c5d25176fe76256ee4 Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Fri, 24 Jul 2026 14:19:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(oms):=E5=87=BA=E5=85=A5=E5=BA=93=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../po/ExecutionInMaterialDetailWithOrderPO.java      |  9 +++++++++
 .../po/ExecutionOutMaterialDetailWithOrderPO.java     |  9 +++++++++
 .../executionInMaterialDetailMapper.xml               | 11 ++++++-----
 .../ExecutionOutMaterialDetailMapper.xml              |  8 +++++++-
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java
index 8a88a3e24..4697b3ba3 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java
@@ -18,4 +18,13 @@ public class ExecutionInMaterialDetailWithOrderPO extends ExecutionInMaterialDet
 
     @ApiModelProperty("入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
     private Integer inOrderAuditStatus;
+
+    @ApiModelProperty("货主ID")
+    private Long orderShipperId;
+
+    @ApiModelProperty("货主编码")
+    private String orderShipperCode;
+
+    @ApiModelProperty("货主名称")
+    private String orderShipperName;
 }
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 266d61436..03af1f98c 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
@@ -18,4 +18,13 @@ public class ExecutionOutMaterialDetailWithOrderPO extends ExecutionOutMaterialD
 
     @ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
     private Integer outOrderAuditStatus;
+
+    @ApiModelProperty("货主ID")
+    private Long orderShipperId;
+
+    @ApiModelProperty("货主编码")
+    private String orderShipperCode;
+
+    @ApiModelProperty("货主名称")
+    private String orderShipperName;
 }
diff --git a/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml
index 3d4d610e4..fd4e7b2d0 100644
--- a/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml
@@ -363,6 +363,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.mhd.oms.domain.executionInMaterialDetail.repository.po.ExecutionInMaterialDetailWithOrderPO" id="InMaterialDetailWithOrderResult" extends="MaterialDetailResult">
         <result property="inOrderStatus"       column="in_order_status"       />
         <result property="inOrderAuditStatus"  column="in_order_audit_status" />
+        <result property="orderShipperId"      column="order_shipper_id"      />
+        <result property="orderShipperCode"    column="order_shipper_code"    />
+        <result property="orderShipperName"    column="order_shipper_name"    />
     </resultMap>
 
     <select id="queryInOrderDetailList" parameterType="com.mhd.oms.domain.executionInMaterialDetail.repository.todo.QueryOrderOverStockDO"
@@ -396,12 +399,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.contract_fee, a.monthly_warehouse_fee, a.half_month_wh_fee, a.discount_rate,
         a.single_volume, a.single_gross_weight, a.lot_no,
         a.drink_date, a.fire_insure_fee, a.unit_price,
-        a.inventory_before_quantity, a.allocation_before_quantity, a.freeze_before_quantity,
-        a.inventory_after_quantity, a.allocation_after_quantity, a.freeze_after_quantity,
-        a.net_weight, a.gross_weight, a.volume, a.area,
-        a.adjusted_net_weight, a.adjusted_gross_weight, a.adjusted_volume, a.adjusted_area,
         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.lot_number, a.in_order_number_gw, a.in_line_num_gw,
+        b.shipper_id as order_shipper_id,
+        b.shipper_code as order_shipper_code,
+        b.shipper_name as order_shipper_name,
         b.status as in_order_status,
         b.audit_status as in_order_audit_status
         from execution_in_material_detail a
diff --git a/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml
index b07d09f31..0d6dda811 100644
--- a/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml
@@ -454,6 +454,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                id="OutMaterialDetailWithOrderResult" extends="MaterialDetailResult">
         <result property="outOrderStatus"      column="out_order_status"      />
         <result property="outOrderAuditStatus" column="out_order_audit_status" />
+        <result property="orderShipperId"      column="order_shipper_id"      />
+        <result property="orderShipperCode"    column="order_shipper_code"    />
+        <result property="orderShipperName"    column="order_shipper_name"    />
     </resultMap>
 
     <select id="queryOutOrderDetailList"
@@ -482,12 +485,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.DECLARE_QUANTITY, a.CASE_COUNT, a.PIECE_COUNT, a.OUTBOUND_QUANTITY,
             a.TOTAL_NET_WEIGHT, a.TOTAL_GROSS_WEIGHT, a.TOTAL_VOLUME, a.TOTAL_AREA, a.TOTAL_AMOUNT,
             a.UNIT, a.EXT_ATTR_1, a.EXT_ATTR_2, a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE,
-            a.EXT_ATTR_3, a.EXT_ATTR_4, a.INVENTORY_QUANTITY,
+            a.EXT_ATTR_3, a.EXT_ATTR_4,
             a.contract_fee, a.monthly_warehouse_fee, a.half_month_wh_fee, a.discount_rate,
             a.single_volume, a.single_gross_weight, a.lot_no, a.in_order_number,
             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,
+            b.shipper_id as order_shipper_id,
+            b.shipper_code as order_shipper_code,
+            b.shipper_name as order_shipper_name,
             b.status as out_order_status,
             b.audit_status as out_order_audit_status
         from execution_out_material_detail a