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 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 AND m.Site = #{query.site} - AND ISNULL(m.QtyToIssue_Original,0) < ISNULL(m.QtyToIssue,0) + AND DATEDIFF(MINUTE, o.needDate, GETDATE()) > 0 AND calc.overtimeMinutes > 0 + + AND ISNULL(m.QtyToIssue_Original,0) < ISNULL(m.QtyToIssue,0) + + AND m.NotifyNo = #{query.notifyNo}