领料预警修改

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;
 }

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>