diff --git a/NFine.Application/SRM/WatchPanelApp.cs b/NFine.Application/SRM/WatchPanelApp.cs index 828b48b..5f53634 100644 --- a/NFine.Application/SRM/WatchPanelApp.cs +++ b/NFine.Application/SRM/WatchPanelApp.cs @@ -1178,7 +1178,7 @@ xx.[暂停备注],A.ACTIONRESULT,LL.OPSEQ ORDER BY C.molotcode, C.ITEMCODE ,LL.OPSEQ,us.UserName asc -SELECT * FROM #TempCCDD +SELECT *,case when 暂停开始时间 is not null and 暂停结束时间 is null then '暂停中' else '' end 暂停状态 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')) diff --git a/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPDetail.cshtml b/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPDetail.cshtml index e52520a..2663075 100644 --- a/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPDetail.cshtml +++ b/NFine.Web/Areas/SRM/Views/WatchPanel/PanelWIPDetail.cshtml @@ -98,6 +98,9 @@ .rightMain_bottomIn .biaoge { height: calc(100% ); } + .zantingCla li { + color:yellow !important; + }