From 73248de0dafbac2bcdca04fbf084bbd26f2d25e0 Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Thu, 3 Jul 2025 15:58:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E6=9D=90=E5=88=B0=E8=B4=A7=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=94=B6=E8=B4=A7=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/wms/WmsRawOrderInMapper.xml      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml
index e5a147ae6..9b22b29a1 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml
@@ -192,6 +192,9 @@
             <if test="lastModifiedBy != null  and lastModifiedBy != ''">and wms_raw_order_in.last_modified_by = #{lastModifiedBy}</if>
             <if test="gmtModified != null ">and wms_raw_order_in.gmt_modified = #{gmtModified}</if>
             <if test="activeFlag != null  and activeFlag != ''">and wms_raw_order_in.active_flag = #{activeFlag}</if>
+            <if test="activeFlag != null  and activeFlag != ''">and wms_raw_order_in.active_flag = #{activeFlag}</if>
+            <if test="deliveryTimeStart != null  and deliveryTimeStart != ''">and CONVERT(varchar(16), wms_raw_order_in.request_time, 120) >= #{deliveryTimeStart}</if>
+            <if test="deliveryTimeEnd != null  and deliveryTimeEnd != ''">and #{deliveryTimeEnd} >= CONVERT(varchar(16), wms_raw_order_in.request_time, 120)</if>
         </where>
         ORDER BY	wms_raw_order_in.gmt_create	DESC
     </select>