diff --git a/NFine.Application/SRM/WatchPanelApp.cs b/NFine.Application/SRM/WatchPanelApp.cs
index 8705ea3..828b48b 100644
--- a/NFine.Application/SRM/WatchPanelApp.cs
+++ b/NFine.Application/SRM/WatchPanelApp.cs
@@ -1126,6 +1126,8 @@ select * from (
             string SqlText = "";
             
                 SqlText = @" 
+ if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#TempCCDD'))
+			 drop table #TempCCDD 
 SELECT DISTINCT  C.molotcode as 销售车号,C.ITEMCODE 物料编码,dd.INVNAME 物料名称 ,C.MOCODE 工单号,LL.OPSEQ,
 a.OPCODE 工序代码,ppp.opname 工序名称,us.UserName 报工人,
 CASE WHEN A.ACTIONRESULT='COLLECT_BEGIN' then '----生产中----'  WHEN A.ACTIONRESULT='COLLECT_END' then '----已结束----' end as 工序结束状态,
@@ -1138,6 +1140,7 @@ CONVERT(VARCHAR,xx.开始时间 ,120)  as 暂停开始时间,
 CONVERT(VARCHAR,xx.结束时间,120)  as 暂停结束时间,
 xx.[暂停原因],
 xx.[暂停备注]
+into #TempCCDD
 FROM ICSLOTONWIP  A 
 LEFT JOIN ICSLOTONWIPDetail B  ON A.LOTNO=B.LOTNO AND A.OPCODE=B.OPCODE
 LEFT JOIN ICSOP ppp on a.OPCODE=ppp.OPCODE
@@ -1168,11 +1171,18 @@ where pp.MODELCODE='标准报工'  and vv.EnumKey='00022'  --AND a.LOTNO=''-- an
 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
-where 1=1 AND b.Type='标准报工'  and a.WorkPoint='6000' 
+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.[暂停原因],
 xx.[暂停备注],A.ACTIONRESULT,LL.OPSEQ
+
 ORDER BY C.molotcode, C.ITEMCODE ,LL.OPSEQ,us.UserName asc
 
+
+SELECT * FROM #TempCCDD
+WHERE CONVERT(varchar(10), 开工时间, 21) =(SELECT MAX(CONVERT(varchar(10), 开工时间, 21)) FROM #TempCCDD)
+ORDER BY 销售车号,物料编码,报工人
+ if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#TempCCDD'))
+			 drop table #TempCCDD 
   ";
             
             
diff --git a/NFine.Web/NFine.Web.csproj b/NFine.Web/NFine.Web.csproj
index 5b3143e..41954de 100644
--- a/NFine.Web/NFine.Web.csproj
+++ b/NFine.Web/NFine.Web.csproj
@@ -259,6 +259,7 @@
     <Content Include="Content\img\samples\scarlet.png" />
     <Content Include="Content\img\samples\scarlett-300.jpg" />
     <Content Include="Content\img\wechat.jpg" />
+    <Content Include="Content\img\zhenxiang.png" />
     <Content Include="Content\js\bootstrap\bootstrap-select.js" />
     <Content Include="Content\js\bootstrap\bootstrap-select.min.js" />
     <Content Include="Content\js\bootstrap\bootstrap-switch.js" />