徐莉 2 years ago
parent
commit
a3cbbf0840
  1. 12
      NFine.Application/SRM/WatchPanelApp.cs
  2. 1
      NFine.Web/NFine.Web.csproj

12
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
";

1
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" />

Loading…
Cancel
Save