diff --git a/NFine.Application/SRM/WatchPanelApp.cs b/NFine.Application/SRM/WatchPanelApp.cs index ee4ce19..653d458 100644 --- a/NFine.Application/SRM/WatchPanelApp.cs +++ b/NFine.Application/SRM/WatchPanelApp.cs @@ -1208,7 +1208,9 @@ ORDER BY 销售车号,物料编码,报工人 where moth = CONVERT(CHAR(10),DATEADD(month,0,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120) )a left join ( select isnull(realsaleout,0) 上月度发车 from ICSZXBoardSaleout - where id = '1') b on 1=1"; + where id = '1') b on 1=1 + left join ( select isnull(realsaleout,0) 年度发车 from ICSZXBoardSaleout + where id = '2') on 1=1 "; DataTable dt = Repository().GetDataTableBySql_Other(SqlText, "MESconnstr", null); return dt; } @@ -1314,9 +1316,12 @@ ORDER BY 销售车号,物料编码,报工人 select count(*) 前月完成 from #tempNum t where t.wipnum = t.monum and t.EndTime between CONVERT(CHAR(10),DATEADD(month,-2,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120) and CONVERT(CHAR(10),DATEADD(month,-1,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)) d on 1=1 + left join ( + select count(*) 年度生产 from #tempNum t where t.wipnum = t.monum and t.EndTime >= + CONVERT(CHAR(10),DATEADD(month,-MONTH(GETDATE())+1,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)) e on 1=1 select isnull(上月度生产,'0') 上月度生产 , isnull(上月完成,'0') 上月完成, - isnull(前月度生产,'0') 前月度生产 , isnull(前月完成,'0') 前月完成, + isnull(前月度生产,'0') 前月度生产 , isnull(前月完成,'0') 前月完成,isnull(年度生产,'0') 年度生产, --case when isnull(上月度生产,0) = 0 then 0 else --convert(decimal(10,2),isnull(上月度生产,0))*1.0/isnull(convert(decimal(10,2),case when 上月完成 = 0 then 1 else 上月完成 end),1) end 上月比, --case when isnull(前月度生产,0) = 0 then 0 else