领料延误修改

src/main/java/com/xujie/sys/modules/orderIssure/entity/SOIssueNotifyOrderMaterialListData.java

@@ -52,6 +52,9 @@ public class SOIssueNotifyOrderMaterialListData extends SOIssueNotifyOrderMateri
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date notifyDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date EnteredDate;
     // 车间
     private String workShopName;
     private String startDate;
@@ -60,6 +63,8 @@ public class SOIssueNotifyOrderMaterialListData extends SOIssueNotifyOrderMateri
     // 分页参数
     List<String> workShopList;
 
+    List<String> timeoutReasons;
+
     private Integer page = 1;
     private Integer limit = 100;
 }

src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml

@@ -390,15 +390,13 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
             h.UserName,
             dbo.plm_get_user_display(h.Site, h.UserName) AS userDisplay,
             h.NotifyDate,
+            h.EnteredDate,
             w.workShopName,
             o.SOOrderNo as orderNo,
             o.OpsItemNo as opsItemNo,
             o.SeqNo as seqNo,
             m.timeout_reason,
-            CASE
-            when h.confirm_status = '确认' then DATEDIFF(MINUTE, o.needDate, h.confirm_date)/ 60.0
-            else DATEDIFF(MINUTE, o.needDate, GETDATE())/ 60.0
-            end as overtimeMinutes
+            calc.overtimeMinutes
 
         FROM SOIssueNotifyOrderMaterialList m
         INNER JOIN SOIssueNotifyOrderList o
@@ -409,10 +407,18 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
             ON h.UserName = u.username
         LEFT JOIN eam_WorkShop w
             ON u.workShopId = w.workShopId
+        CROSS APPLY (
+        SELECT
+        CASE
+        when h.confirm_status = '确认' then DATEDIFF(MINUTE, o.needDate, h.confirm_date)/ 60.0
+        else DATEDIFF(MINUTE, o.needDate, GETDATE())/ 60.0
+        end as overtimeMinutes
+        ) 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.notifyNo != null and query.notifyNo != ''">
                 AND m.NotifyNo = #{query.notifyNo}
@@ -468,6 +474,19 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
                         AND w.WorkShopId in ('WS005','WS006')
                 </otherwise>
             </choose>
+                <if test="query.timeoutReasons != null and query.timeoutReasons.size > 0">
+                    AND (
+                        m.timeout_reason IN (
+                            <foreach collection="query.timeoutReasons" item="item" separator=",">
+                                #{item}
+                            </foreach>
+                        )
+                        <if test="'isemtpy' in query.timeoutReasons">
+                            OR LTRIM(RTRIM(m.timeout_reason)) = ''
+                            OR m.timeout_reason IS NULL
+                        </if>
+                    )
+                </if>
         </where>
         ORDER BY m.NotifyNo, o.needDate, m.ItemNo
     </select>