From 9d9a9ccacb7e7e7457a1cbe22781606289c2b34c Mon Sep 17 00:00:00 2001 From: fyw Date: Thu, 18 Apr 2024 17:13:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NFine.Application/SRM/WatchPanelApp.cs | 6 +++--- .../Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa2.cshtml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NFine.Application/SRM/WatchPanelApp.cs b/NFine.Application/SRM/WatchPanelApp.cs index a180946..a6629fa 100644 --- a/NFine.Application/SRM/WatchPanelApp.cs +++ b/NFine.Application/SRM/WatchPanelApp.cs @@ -1295,10 +1295,10 @@ ORDER BY 销售车号,物料编码,报工人 group by tso.socode ) tmo left join ( - select tso.socode ,count(*) as wipnum,min(wip.EndTime) EndTime from + select tso.socode ,count(*) as wipnum,max(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 + left join (select mocode,molotcode,moseq from icsmo group by mocode,molotcode,moseq) tmo on tso.socode = tmo.molotcode + LEFT JOIN ICSLOTSIMULATION wip on tmo.mocode = wip.mocode and tmo.moseq = wip.moseq where wip.iscom='1' group by tso.socode ) wip on tmo.socode = wip.socode diff --git a/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa2.cshtml b/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa2.cshtml index 6122085..cb28c4a 100644 --- a/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa2.cshtml +++ b/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPZhiXingDa2.cshtml @@ -855,8 +855,8 @@ background-color:#6495ED;"> value3 = data[i].前月完成; value4 = data[i].上月比; value5 = data[i].前月比; - value6 = data[0].前月; - value7 = data[0].上月; + value6 = data[0].上月; + value7 = data[0].前月; } $("#div3-C1-C1").html(value7 + "月完成率"); $("#div3-C2-C1").html(value6 + "月完成率");