优化看板

NFine.Application/SRM/WatchPanelApp.cs

@@ -1170,9 +1170,12 @@ LEFT JOIN Sys_EnumValues vv on vv.EnumValue=pp.RESCODE --AND vv.EnumKey='00022'
 where pp.MODELCODE='标准报工'  and vv.EnumKey='00022'  --AND a.LOTNO=''-- and A.ACTIONRESULT = 'COLLECT_END'
 GROUP BY C.molotcode,C.ITEMCODE ,dd.INVNAME ,gg.ROUTECODE, A.LOTNO,c.MOCODE ,c.MOSEQ , A.OPCODE ,us.UserName,pp.BeginTime,pp.EndTime,vv.EnumText ,
 pp.Memo) 
-xx  on xx.[工单号]=c.MOCODE AND xx.[工单行号]=c.MOSEQ AND A.OPCODE=xx.[工序] AND xx.[报工人]=us.UserName  AND  xx.开始时间 >B.BeginDateTime AND xx.结束时间 < B.EndDateTime
+xx  on xx.[工单号]=c.MOCODE AND xx.[工单行号]=c.MOSEQ AND A.OPCODE=xx.[工序] AND xx.[报工人]=us.UserName  AND  xx.开始时间 >B.BeginDateTime 
+--AND xx.结束时间 < B.EndDateTime
+AND ISNULL(xx.结束时间, '2024-02-21 17:37:02') < ISNULL(B.EndDateTime, '2025-02-21 17:37:02')
 where 1=1 AND b.Type='标准报工'  and a.WorkPoint='6000'  and B.BeginDateTime>=DATEADD(mm, -3, getdate())
-GROUP BY C.molotcode,C.ITEMCODE ,dd.INVNAME ,gg.ROUTECODE, A.LOTNO,c.MOCODE ,c.MOSEQ , A.OPCODE ,us.UserName,xx.[暂停时长],nn.ISCOM,b.MTIME,B.BeginDateTime, B.EndDateTime,xx.[开始时间],xx.[结束时间],ppp.opname,xx.[暂停原因],
+GROUP BY C.molotcode,C.ITEMCODE ,dd.INVNAME ,gg.ROUTECODE, A.LOTNO,c.MOCODE ,c.MOSEQ , A.OPCODE ,
+us.UserName,xx.[暂停时长],nn.ISCOM,b.MTIME,B.BeginDateTime, B.EndDateTime,xx.[开始时间],xx.[结束时间],ppp.opname,xx.[暂停原因],
 xx.[暂停备注],A.ACTIONRESULT,LL.OPSEQ
 
 ORDER BY C.molotcode, C.ITEMCODE ,LL.OPSEQ,us.UserName asc

NFine.Web/Areas/SRM/Views/WatchPanel/PanelCK.cshtml

@@ -336,9 +336,9 @@
                 success: function (data) {
                     if (data != false && data != null && data.length > 0) {
                        
-                     
+                        var html = "";
                         for (var i = 0; i < data.length; i++) {
-                            var html = "<ul>";
+                             html += "<ul>";
                      
                             html += '  <li  >' + data[i].销售车号 + '</li>  ';
                             html += '  <li  >' + data[i].部件名称 + '</li> <li  >' + data[i].人员 + '</li>';
@@ -370,8 +370,8 @@
                     
                         for (var i = 0; i < data.length; i++) {
                        
-                            $("#ttt2").html="<li>"+data[i].待检车辆+"台</li> <li>"+data[i].已检车辆+
-                              "台</li>  <li>" + data[i].待整改 + "台</li>   <li>" + data[i].已整改 + "台</li>";
+                            $("#ttt2").html ( "<li>" + data[i].待检车辆 + "台</li> <li>" + data[i].已检车辆 +
+                              "台</li>  <li>" + data[i].待整改 + "台</li>   <li>" + data[i].已整改 + "台</li>");
                             
                         }