From 4a531b536dd29dfe1aab149364e7dba232c5d050 Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Sat, 30 May 2026 15:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessDocumentOrderApplicationService.java           | 2 +-
 .../ReservationStockInOrderMapper.xml                      | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java
index de8c1d13c..b4285606d 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java
@@ -187,7 +187,7 @@ public class BusinessDocumentOrderApplicationService {
             body.put("erpBillNo", String.valueOf(pushData.getId()));
             body.put("billDate", pushData.getDocumentDate());
             body.put("goodsType", pushData.getGoodsType());
-            body.put("ieFlag", pushData.getIeType() != null ? String.valueOf(pushData.getIeType()) : null);
+            body.put("ieFlag", pushData.getIeType() != null ? pushData.getIeType() : null);
             body.put("corpCode", pushData.getAppointShipperId() != null ? pushData.getAppointShipperId().toString() : null);
 
             List<Map<String, Object>> billList = new ArrayList<>();
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index 39021d39c..80a8f4398 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -93,6 +93,10 @@
         <result property="directorName"    column="DIRECTOR_NAME"    />
         <result property="storageTime"    column="STORAGE_TIME"    />
         <result property="inQuantity"    column="IN_QUANTITY"    />
+        <result property="pushTime"    column="PUSH_TIME"    />
+        <result property="pushStatus"    column="PUSH_STATUS"    />
+        <result property="pushBy"    column="PUSH_BY"    />
+        <result property="pushByName"    column="PUSH_BY_NAME"    />
     </resultMap>
 
 
@@ -128,7 +132,8 @@
         a.TRANSPORT_METHOD, a.SUPERVISION_METHOD, a.CUSTOMS_INSPECTION, a.NEED_CUSTOMS_DECLARATION, a.NEED_TRANSPORT,
         a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.reservation_audit_time,a.reservation_audit_name
         ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.RESERVATION_ORDER_SOURCE,a.tms_order_number
-        ,a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.STORAGE_TIME,a.in_quantity
+        ,a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.STORAGE_TIME,a.in_quantity,
+        a.PUSH_TIME,a.PUSH_STATUS,a.PUSH_BY,a.PUSH_BY_NAME
     </sql>
 
     <sql id="joinStockInOrderPo">