diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index 19f6a48f..4aee8c69 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -381,7 +381,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu) m.QtyToIssue, m.QtyToIssue_Original, m.issueType, - m.remark AS timeoutReason, + m.remark , dbo.Get_PartDesc(m.Site, m.ComponentPartNo) AS partDesc, o.needDate, o.locationNo, @@ -435,9 +435,16 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu) - + - AND m.remark = #{query.timeoutReason} + + + AND (LTRIM(RTRIM(m.timeout_reason)) = '' OR m.timeout_reason IS NULL) + + + AND m.timeout_reason = #{query.timeoutReason} + + AND h.NotifyDate =]]> #{query.startDate}