From 8964f5c08768433c44b213d306c9d4215f23293c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 4 Jun 2026 11:17:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=B8=9A=E5=8A=A1=E5=8D=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/todo/ReservationStockInOrderDO.java        | 2 ++
 .../repository/todo/ReservationStockOutOrderDO.java       | 2 ++
 .../ReservationStockInOrderMapper.xml                     | 8 +++++++-
 .../ReservationStockOutOrderMapper.xml                    | 8 +++++++-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java
index 90f6645e9..81823383c 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java
@@ -472,4 +472,6 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date pushTimeEnd;
+
+    private String xfStatus;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
index ad15a33aa..54bffb07f 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
@@ -553,4 +553,6 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date pushTimeEnd;
+
+    private String xfStatus;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index 4b7876504..41c4eeef8 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -450,6 +450,12 @@
         <if test="expectTimeEnd != null and expectTimeEnd != ''">
             and date_format(a.expect_time,'%Y-%m-%d') &lt;= #{expectTimeEnd}
         </if>
+        <if test="xfStatus != null  and xfStatus != '' and xfStatus == '已下发'">
+            and b.in_order_number is not null
+        </if>
+        <if test="xfStatus != null  and xfStatus != '' and xfStatus == '未下发'">
+            and b.in_order_number is null
+        </if>
         <!-- 入库明细：物料名称、物料编码（同一明细行同时满足；与计划数量汇总口径一致）。关联 material_base_info 避免明细冗余名称与主档不一致时筛不到 -->
         <if test="(materialName != null and materialName != '') or (materialCode != null and materialCode != '')">
             and exists (
@@ -481,7 +487,7 @@
     <select id="queryList" parameterType="com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO" resultMap="StockInOrderResult">
         select
         <include refid="selectStockInOrderPo"/>
-        from reservation_stock_in_order a
+        from reservation_stock_in_order a left join NGWL_TEST_WMS.stock_in_order b on a.in_order_number = b.in_order_number
         <where>
             <include refid="selectStockInOrderPo1"/>
         </where>
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
index 6fa6c9a17..d2e5ad6a5 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -352,6 +352,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="orderTypeName != null  and orderTypeName != ''">
             and a.order_type_name like concat('%', #{orderTypeName}, '%')
         </if>
+        <if test="xfStatus != null  and xfStatus != '' and xfStatus == '已下发'">
+            and b.out_order_number is not null
+        </if>
+        <if test="xfStatus != null  and xfStatus != '' and xfStatus == '未下发'">
+            and b.out_order_number is null
+        </if>
         <!-- 出库明细：物料名称、物料编码（同一明细行同时满足；与出库明细口径一致）。关联 material_base_info 避免明细冗余名称与主档不一致时筛不到 -->
 <!--        <if test="(materialName != null and materialName != '') or (materialCode != null and materialCode != '')">-->
 <!--            and exists (-->
@@ -383,7 +389,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryList" parameterType="com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDO" resultMap="StockOutOrderResult">
         select
             <include refid="selectStockOutOrderPo"/>
-        from reservation_stock_out_order a
+        from reservation_stock_out_order a left join NGWL_TEST_WMS.stock_out_order b on a.out_order_number = b.out_order_number
         <where>
             <include refid="selectStockOutOrderPo1"/>
         </where>