From 9afa98b368dd2729a55a930bb3d97a1a62205553 Mon Sep 17 00:00:00 2001
From: DOUDOU <877258667@qq.com>
Date: Mon, 6 Mar 2023 18:17:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8E=92=E4=BA=A7=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E5=89=8D=E9=81=93=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index cdfb87b..099352b 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -140,6 +140,9 @@
             <if test="scheduledFlag != null and scheduledFlag != ''">
                 AND Isnull(S1.ScheduledFlag, 'Y') = #{scheduledFlag}
             </if>
+            <if test='preScheduledFlag != null and preScheduledFlag == "Y"'>
+                and Isnull(S1.ScheduledFlag,'Y') = 'Y'
+            </if>
             AND dbo.Get_SOOpsScheduleAvailResource(T.Site,T.OrderNo,T.WorkCenterNo,T.ItemNo) like '%' + #{resourceId} +
             '(%'
         </where>