From f32f43ab18364dbf90d75d9dae104dda5804083a Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Fri, 24 Jul 2026 15:46:30 +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/ExecutionOutMaterialDetailWithOrderPO.java  | 14 ++++++++++++++
 .../ExecutionOutMaterialDetailMapper.xml           |  4 ++++
 2 files changed, 18 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 03af1f98c..6cc1c9823 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
@@ -1,7 +1,11 @@
 package com.mhd.oms.domain.executionOutMaterialDetail.repository.po;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * 出库明细查询结果（关联出库执行单）
@@ -27,4 +31,14 @@ public class ExecutionOutMaterialDetailWithOrderPO extends ExecutionOutMaterialD
 
     @ApiModelProperty("货主名称")
     private String orderShipperName;
+
+    @ApiModelProperty("出仓日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date orderOutboundDate;
+
+    @ApiModelProperty("出库时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date orderOutboundTime;
 }
diff --git a/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml
index 0d6dda811..8fd4090a8 100644
--- a/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml
@@ -457,6 +457,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderShipperId"      column="order_shipper_id"      />
         <result property="orderShipperCode"    column="order_shipper_code"    />
         <result property="orderShipperName"    column="order_shipper_name"    />
+        <result property="orderOutboundDate"   column="order_outbound_date"   />
+        <result property="orderOutboundTime"   column="order_outbound_time"   />
     </resultMap>
 
     <select id="queryOutOrderDetailList"
@@ -494,6 +496,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.shipper_id as order_shipper_id,
             b.shipper_code as order_shipper_code,
             b.shipper_name as order_shipper_name,
+            b.OUTBOUND_DATE as order_outbound_date,
+            b.OUTBOUND_TIME as order_outbound_time,
             b.status as out_order_status,
             b.audit_status as out_order_audit_status
         from execution_out_material_detail a