From f227c10fc87427f57c1cc07c2ef4e393b0342931 Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Tue, 10 Feb 2026 11:37:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E9=A2=84=E8=AD=A6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SOIssueNotifyOrderMaterialListData.java          | 2 ++
 .../resources/mapper/orderIssure/IssureNotifyMapper.xml     | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOIssueNotifyOrderMaterialListData.java b/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOIssueNotifyOrderMaterialListData.java
index e679d747..5afb5844 100644
--- a/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOIssueNotifyOrderMaterialListData.java
+++ b/src/main/java/com/xujie/sys/modules/orderIssure/entity/SOIssueNotifyOrderMaterialListData.java
@@ -65,6 +65,8 @@ public class SOIssueNotifyOrderMaterialListData extends SOIssueNotifyOrderMateri
 
     List<String> timeoutReasons;
 
+    private Boolean overtimeNotDistributed;
+
     private Integer page = 1;
     private Integer limit = 100;
 }
diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
index 4e1b2c54..4d729e80 100644
--- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
+++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
@@ -416,10 +416,14 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
         ) AS calc
         <where>
             AND m.Site = #{query.site}
-            AND ISNULL(m.QtyToIssue_Original,0) &lt; ISNULL(m.QtyToIssue,0)
+
             AND DATEDIFF(MINUTE, o.needDate, GETDATE()) > 0
             AND calc.overtimeMinutes &gt; 0
 
+            <if test="query.overtimeNotDistributed != null and query.overtimeNotDistributed == false">
+                AND ISNULL(m.QtyToIssue_Original,0) &lt; ISNULL(m.QtyToIssue,0)
+            </if>
+
             <if test="query.notifyNo != null and query.notifyNo != ''">
                 AND m.NotifyNo = #{query.notifyNo}
             </if>