From aa441e0518ce036245bfb9ac99dd38d704c1a845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Sat, 18 Apr 2026 14:26:26 +0800
Subject: [PATCH] =?UTF-8?q?oms=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/po/ReservationStockInOrderPO.java             | 3 +++
 .../repository/po/ReservationStockOutOrderPO.java            | 3 +++
 .../ReservationStockInOrderMapper.xml                        | 5 ++++-
 .../ReservationStockOutOrderMapper.xml                       | 5 ++++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
index 3b51b668b..ac48693d5 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
@@ -410,4 +410,7 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
     @ApiModelProperty("业务员名称")
     private String salesmanName;
 
+    @ApiModelProperty("tms订单号")
+    private String tmsOrderNumber;
+
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java
index 9e054ca66..946c1ba73 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java
@@ -437,4 +437,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
     private String salesmanId;
     @ApiModelProperty("业务员名称")
     private String salesmanName;
+
+    @ApiModelProperty("tms订单号")
+    private String tmsOrderNumber;
 }
\ 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 61b74660f..3534403b6 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -121,7 +121,7 @@
         a.CUSTOMS_BROKER_INFO, a.DELIVERY_ADDRESS, a.ENTRY_EXIT_CUSTOMS, a.ORIGIN_DESTINATION_COUNTRY, a.CARRIER, a.CONTAINER_NO,
         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_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.tms_order_number
     </sql>
 
     <sql id="joinStockInOrderPo">
@@ -192,6 +192,9 @@
         <if test="organizationId != null ">
             and a.organization_id = #{organizationId}
         </if>
+        <if test="tmsOrderNumber != null  and tmsOrderNumber != ''">
+            and a.tms_order_number like concat('%', #{tmsOrderNumber}, '%')
+        </if>
         <if test="organizationName != null  and organizationName != ''">
             and a.organization_name like concat('%', #{organizationName}, '%')
         </if>
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
index dc30d113f..eae41f721 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE,
         a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME,
         a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,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_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.tms_order_number
     </sql>
 
 
@@ -128,6 +128,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="organizationId != null ">
             and a.organization_id = #{organizationId}
         </if>
+        <if test="tmsOrderNumber != null  and tmsOrderNumber != ''">
+            and a.tms_order_number like concat('%', #{tmsOrderNumber}, '%')
+        </if>
         <if test="organizationName != null  and organizationName != ''">
             and a.organization_name like concat('%', #{organizationName}, '%')
         </if>