diff --git a/NFine.Application/SRM/WatchPanelApp.cs b/NFine.Application/SRM/WatchPanelApp.cs
index dd07f9e..9483f41 100644
--- a/NFine.Application/SRM/WatchPanelApp.cs
+++ b/NFine.Application/SRM/WatchPanelApp.cs
@@ -1201,11 +1201,11 @@ ORDER BY 销售车号,物料编码,报工人
string where1 = "";
string SqlText = "";
SqlText = @" select * from(
- select isnull(mpproduct,0) as 月度生产,isnull(mpsaleout,0) 月度发车 from ICSZXBoardPlan
- where moth = CONVERT(CHAR(10),DATEADD(month,0,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120) )a
- left join (
- select isnull(mpproduct,0) as 上月度生产,isnull(mpsaleout,0) 上月度发车 from ICSZXBoardPlan
- where moth = CONVERT(CHAR(10),DATEADD(month,-1,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120) ) b on 1=1";
+ select isnull(mpproduct,0) as 月度生产,isnull(mpsaleout,0) 月度发车 from ICSZXBoardPlan
+ 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";
DataTable dt = Repository().GetDataTableBySql_Other(SqlText, "MESconnstr", null);
return dt;
}
@@ -1342,61 +1342,117 @@ ORDER BY 销售车号,物料编码,报工人
{
string SqlText = "";
- SqlText = @"
- if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempMO'))
- drop table #tempMO
- if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempM'))
- drop table #tempM
- --获取当前月份前十一个月的最大工单行数据
- select mocode,max(MOSEQ) as moseq
- into #tempMO
- from icsmo
- where MTIME between CONVERT(CHAR(10),DATEADD(month,-11,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111)
- and CONVERT(CHAR(10),DATEADD(month,0,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111)
- group by mocode
- --查询出当前年月向前十二月数据
- select *
- into #tempM
- from
- (select
- CONVERT(CHAR(7),DATEADD(month,-11,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
- union select
- CONVERT(CHAR(7),DATEADD(month,-10,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
- union select
- CONVERT(CHAR(7),DATEADD(month,-9,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
- union select
- CONVERT(CHAR(7),DATEADD(month,-8,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
- union select
- CONVERT(CHAR(7),DATEADD(month,-7,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
- union select
- CONVERT(CHAR(7),DATEADD(month,-6,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
- union select
- CONVERT(CHAR(7),DATEADD(month,-5,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
- union select
- CONVERT(CHAR(7),DATEADD(month,-4,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
- union select
- CONVERT(CHAR(7),DATEADD(month,-3,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
- union select
- CONVERT(CHAR(7),DATEADD(month,-2,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
- union select
- CONVERT(CHAR(7),DATEADD(month,-1,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
- union select
- CONVERT(CHAR(7),DATEADD(month,0,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont) TempM
-
- --获取前十二月数据
- select Mont,isnull(num,0) as num from #tempM tm
- left join (
- select convert(varchar(7),EndTime ,111) endtime, count(*) num
- from ICSLOTONWIP wip
- left join #tempMO mo on mo.moseq = wip.MOSEQ and mo.MOCODE = wip.MOCODE
- where wip.ACTIONRESULT = 'COLLECT_END'
- group by convert(varchar(7),EndTime ,111)) wip on tm.Mont= wip.endtime
-
- if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempMO'))
- drop table #tempMO
- if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempM'))
- drop table #tempM
- ";
+ //SqlText = @"
+ // if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempMO'))
+ // drop table #tempMO
+ // if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempM'))
+ // drop table #tempM
+ // --获取当前月份前十一个月的最大工单行数据
+ // select mocode,max(MOSEQ) as moseq
+ // into #tempMO
+ // from icsmo
+ // where MTIME between CONVERT(CHAR(10),DATEADD(month,-11,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111)
+ // and CONVERT(CHAR(10),DATEADD(month,0,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111)
+ // group by mocode
+ // --查询出当前年月向前十二月数据
+ // select *
+ // into #tempM
+ // from
+ // (select
+ // CONVERT(CHAR(7),DATEADD(month,-11,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
+ // union select
+ // CONVERT(CHAR(7),DATEADD(month,-10,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
+ // union select
+ // CONVERT(CHAR(7),DATEADD(month,-9,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
+ // union select
+ // CONVERT(CHAR(7),DATEADD(month,-8,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
+ // union select
+ // CONVERT(CHAR(7),DATEADD(month,-7,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
+ // union select
+ // CONVERT(CHAR(7),DATEADD(month,-6,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
+ // union select
+ // CONVERT(CHAR(7),DATEADD(month,-5,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
+ // union select
+ // CONVERT(CHAR(7),DATEADD(month,-4,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
+ // union select
+ // CONVERT(CHAR(7),DATEADD(month,-3,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
+ // union select
+ // CONVERT(CHAR(7),DATEADD(month,-2,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
+ // union select
+ // CONVERT(CHAR(7),DATEADD(month,-1,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont
+ // union select
+ // CONVERT(CHAR(7),DATEADD(month,0,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont) TempM
+
+ // --获取前十二月数据
+ // select Mont,isnull(num,0) as num from #tempM tm
+ // left join (
+ // select convert(varchar(7),EndTime ,111) endtime, count(*) num
+ // from ICSLOTONWIP wip
+ // left join #tempMO mo on mo.moseq = wip.MOSEQ and mo.MOCODE = wip.MOCODE
+ // where wip.ACTIONRESULT = 'COLLECT_END'
+ // group by convert(varchar(7),EndTime ,111)) wip on tm.Mont= wip.endtime
+
+ // if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempMO'))
+ // drop table #tempMO
+ // if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempM'))
+ // drop table #tempM
+ // ";
+ SqlText = @" if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempNum'))
+ drop table #tempNum
+
+ --用销售订单中的销售车辆号查询出工单开工行数,与报工表中的数据做对比 相等的为完工数量
+ select tmo.socode,tmo.monum,isnull(wip.wipnum ,0) as wipnum ,wip.EndTime
+ into #tempNum
+ from
+ (
+ select tso.socode ,count(*) as monum from
+ icsso tso
+ left join icsmo tmo on tso.socode = tmo.molotcode
+ group by tso.socode
+ ) tmo
+ left join (
+ select tso.socode ,count(*) as wipnum,min(wip.EndTime) EndTime from
+ icsso tso
+ left join (select mocode,molotcode from icsmo group by mocode,molotcode) tmo on tso.socode = tmo.molotcode
+ LEFT JOIN ICSLOTSIMULATION wip on tmo.mocode = wip.mocode
+ where wip.iscom='1'
+ group by tso.socode
+ ) wip on tmo.socode = wip.socode
+
+
+ select count(*) num , CONVERT(CHAR(7),DATEADD(month,0,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont from #tempNum t
+ where t.wipnum = t.monum and t.EndTime between
+ CONVERT(CHAR(10),DATEADD(month,-1,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
+ and CONVERT(CHAR(10),DATEADD(month,0,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
+ union
+ select count(*) num , CONVERT(CHAR(7),DATEADD(month,-1,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont 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)
+ union
+ select count(*) num,CONVERT(CHAR(7),DATEADD(month,-2,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont from #tempNum t
+ where t.wipnum = t.monum and t.EndTime between
+ CONVERT(CHAR(10),DATEADD(month,-3,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
+ and CONVERT(CHAR(10),DATEADD(month,-2,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
+ union
+ select count(*) num,CONVERT(CHAR(7),DATEADD(month,-3,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont from #tempNum t
+ where t.wipnum = t.monum and t.EndTime between
+ CONVERT(CHAR(10),DATEADD(month,-4,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
+ and CONVERT(CHAR(10),DATEADD(month,-3,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
+ union
+ select count(*) num,CONVERT(CHAR(7),DATEADD(month,-4,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont from #tempNum t
+ where t.wipnum = t.monum and t.EndTime between
+ CONVERT(CHAR(10),DATEADD(month,-5,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
+ and CONVERT(CHAR(10),DATEADD(month,-4,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
+ union
+ select count(*) num,CONVERT(CHAR(7),DATEADD(month,-5,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),111) Mont from #tempNum t
+ where t.wipnum = t.monum and t.EndTime between
+ CONVERT(CHAR(10),DATEADD(month,-6,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
+ and CONVERT(CHAR(10),DATEADD(month,-5,DATEADD(dd,-DAY(GETDATE())+1,GETDATE())),120)
+
+ if exists(select * from tempdb..sysobjects where id=object_id('tempdb..#tempNum'))
+ drop table #tempNum
+ ";
DataTable dt = Repository().GetDataTableBySql_Other(SqlText, "MESconnstr", null);
return dt;
diff --git a/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa2.cshtml b/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa2.cshtml
index 67feed4..758a7bb 100644
--- a/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa2.cshtml
+++ b/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa2.cshtml
@@ -20,9 +20,9 @@
-
-
-
+
+
+