领料延误修改

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)
                     </otherwise>
                 </choose>
             </if>
-            <!-- 配料状态 = 超时原因，对应 remark -->
+            <!-- 配料状态 = 超时原因-->
             <if test="query.timeoutReason != null and query.timeoutReason != ''">
-                AND m.remark = #{query.timeoutReason}
+                <choose>
+                    <when test="query.timeoutReason == 'isemtpy'">
+                        AND (LTRIM(RTRIM(m.timeout_reason)) = '' OR m.timeout_reason IS NULL)
+                    </when>
+                    <otherwise>
+                        AND m.timeout_reason = #{query.timeoutReason}
+                    </otherwise>
+                </choose>
             </if>
             <if test="query.startDate != null">
                 AND h.NotifyDate <![CDATA[>=]]> #{query.startDate}