no message

NFine.Application/SRM/WatchPanelApp.cs

@@ -1676,7 +1676,7 @@ left join #Tempcccc cc on a.销售车辆号=cc.销售车辆号
             inner join #Tcustttemp1 a on dj.ROUTECODE = a.ROUTECODE and a.OPCODE = dj.OPCODE and optionalop ='检验工序'
             inner join icsmo b  with(nolock) on dj.MOCODE = b.MOCODE and dj.MOSEQ = b.MOSEQ
             inner join ICSMO2user  d  with(nolock) on b.mocode = d.mocode and b.moseq = d.moseq and d.opcode = dj.OPCODE 
- 
+            where  MONTH(d.MTIME)=MONTH(GETDATE()) and YEAR((d.MTIME)) = YEAR(GETDATE())
             union  
             select c.molotCode [销售车号]  --,  d.LOTNO [产品跟踪单], d.OPCODE [工序代码]  
             from 
@@ -1685,9 +1685,10 @@ left join #Tempcccc cc on a.销售车辆号=cc.销售车辆号
             inner JOIN ICSMO2ROUTE  b  with(nolock) on a.routeid = b.routeid
             inner join  ICSMO  c  with(nolock) on c.id = b.moid
             inner join ICSMO2user  d  with(nolock) on c.mocode = d.mocode and c.moseq = d.moseq
-             inner join ICSITEMROUTE2OPLot lot  with(nolock) on lot.itemcode = a.ITEMCODE and b.ROUTECODE = lot.ROUTECODE and lot.OPCODE = d.opcode
+            inner join ICSITEMROUTE2OPLot lot  with(nolock) on lot.itemcode = a.ITEMCODE and b.ROUTECODE = lot.ROUTECODE and lot.OPCODE = d.opcode
+  
+            where not exists (select 1 from ICSLOTONWIP wip  with(nolock) where wip.lotno = d.LOTNO and wip.opcode  =d.OPCODE and wip.actionresult ='COLLECT_END' and MONTH(d.MTIME)=MONTH(GETDATE()) and YEAR((d.MTIME)) = YEAR(GETDATE()))
 
-            where not exists (select 1 from ICSLOTONWIP wip  with(nolock) where wip.lotno = d.LOTNO and wip.opcode  =d.OPCODE and wip.actionresult ='COLLECT_END')
             ) jj
 
 
@@ -1703,7 +1704,7 @@ left join #Tempcccc cc on a.销售车辆号=cc.销售车辆号
             LEFT JOIN ICSITEMROUTE2OPLot ll  with(nolock) on ll.OPCODE=a.OPCODE and ll.LotNo=a.LOTNO
  
  
-            WHERE ll.OPType='检验工序'  and b.MTIME>= CONVERT(varchar(7), dateadd(mm,-1,getdate()), 21) +'-01 00:00:00'
+            WHERE ll.OPType='检验工序'  and  MONTH(d.MTIME)=MONTH(GETDATE()) and YEAR((d.MTIME)) = YEAR(GETDATE()) --b.MTIME>= CONVERT(varchar(7), dateadd(mm,-1,getdate()), 21) +'-01 00:00:00'
             and b.CKRESULT is not null
              ) jj