diff --git a/DOAN.Service/MES/SmartScreen/Product/ProductSmartScreenService.cs b/DOAN.Service/MES/SmartScreen/Product/ProductSmartScreenService.cs
index bf26ec2..8ba3228 100644
--- a/DOAN.Service/MES/SmartScreen/Product/ProductSmartScreenService.cs
+++ b/DOAN.Service/MES/SmartScreen/Product/ProductSmartScreenService.cs
@@ -59,7 +59,7 @@ namespace DOAN.Service.MES.SmartScreen.Product
             EchartsXAxis xAxis = new EchartsXAxis();
            
             xAxis.Data = Context.Queryable<BaseRelWorkRouteProcesses>().LeftJoin<BaseWorkProcesses>((r, p) => r.FkWorkProcesses == p.Id)
-                .Where((r, p) => r.FkWorkRoute == 32)
+                .Where((r, p) => p.Status == 1 && r.FkWorkRoute == 32)
                 .OrderBy((r, p) => p.Id)
                 .Select((r, p) => p.Name)
                 .ToList();
@@ -69,7 +69,7 @@ namespace DOAN.Service.MES.SmartScreen.Product
             echartsSeries.Name = "今日各个工序累计报工数";
             List<EchartsSeriesData> Data = Context.Queryable<ProReportwork01>()
                 .LeftJoin<BaseWorkProcesses>((it,w)=>it.ProcessId==w.Id)
-                .Where((it, w) => it.JobDateTime >= DateTime.Today && it.JobDateTime <= DateTime.Today.AddDays(1))
+                .Where((it, w) =>w.Status==1&& it.JobDateTime >= DateTime.Today && it.JobDateTime <= DateTime.Today.AddDays(1))
                 .GroupBy((it, w) => new {it.ProcessId,w.Name})
                 .Select((it, w) => new EchartsSeriesData()
                 {
@@ -83,7 +83,7 @@ namespace DOAN.Service.MES.SmartScreen.Product
             echartsSeries2.Name = "今日各个工序累计计划数";
             List<EchartsSeriesData> Data2 = Context.Queryable<ProReportwork01>()
                 .LeftJoin<BaseWorkProcesses>((it, w) => it.ProcessId == w.Id)
-                .Where((it, w) => it.JobDateTime >= DateTime.Today && it.JobDateTime <= DateTime.Today.AddDays(1))
+                .Where((it, w) => w.Status == 1 && it.JobDateTime >= DateTime.Today && it.JobDateTime <= DateTime.Today.AddDays(1))
                 .GroupBy((it, w) => new { it.ProcessId, w.Name })
                 .Select((it, w) => new EchartsSeriesData()
                 {
@@ -141,7 +141,7 @@ namespace DOAN.Service.MES.SmartScreen.Product
             echartsSeries2.Name = "本周各个工序累计计划数";
             List<EchartsSeriesData> Data2 = Context.Queryable<ProReportwork01>()
                 .LeftJoin<BaseWorkProcesses>((it, w) => it.ProcessId == w.Id)
-                .Where((it, w) => it.JobDateTime >= mondayMorning && it.JobDateTime <= sundayMidnight)
+                .Where((it, w) => w.Status == 1 && it.JobDateTime >= mondayMorning && it.JobDateTime <= sundayMidnight)
                 .GroupBy((it, w) => new { it.ProcessId, w.Name })
                 .Select((it, w) => new EchartsSeriesData()
                 {
@@ -173,7 +173,7 @@ namespace DOAN.Service.MES.SmartScreen.Product
             EchartsXAxis xAxis = new EchartsXAxis();
 
             xAxis.Data = Context.Queryable<BaseRelWorkRouteProcesses>().LeftJoin<BaseWorkProcesses>((r, p) => r.FkWorkProcesses == p.Id)
-                .Where((r, p) => r.FkWorkRoute == 32)
+                .Where((r, p) => p.Status == 1 && r.FkWorkRoute == 32)
                 .OrderBy((r, p) => p.Id)
                 .Select((r, p) => p.Name)
                 .ToList();
@@ -183,7 +183,7 @@ namespace DOAN.Service.MES.SmartScreen.Product
             echartsSeries.Name = "本月各个工序今日累计报工数";
             List<EchartsSeriesData> Data = Context.Queryable<ProReportwork01>()
                 .LeftJoin<BaseWorkProcesses>((it, w) => it.ProcessId == w.Id)
-                .Where((it, w) => it.JobDateTime >= firstDayOfMonth && it.JobDateTime <= lastDayOfMonth)
+                .Where((it, w) => w.Status == 1 && it.JobDateTime >= firstDayOfMonth && it.JobDateTime <= lastDayOfMonth)
                 .GroupBy((it, w) => new { it.ProcessId, w.Name })
                 .Select((it, w) => new EchartsSeriesData()
                 {
@@ -197,7 +197,7 @@ namespace DOAN.Service.MES.SmartScreen.Product
             echartsSeries2.Name = "本月各个工序今日累计计划数";
             List<EchartsSeriesData> Data2 = Context.Queryable<ProReportwork01>()
                 .LeftJoin<BaseWorkProcesses>((it, w) => it.ProcessId == w.Id)
-                .Where((it, w) => it.JobDateTime >= firstDayOfMonth && it.JobDateTime <= lastDayOfMonth)
+                .Where((it, w) => w.Status == 1 && it.JobDateTime >= firstDayOfMonth && it.JobDateTime <= lastDayOfMonth)
                 .GroupBy((it, w) => new { it.ProcessId, w.Name })
                 .Select((it, w) => new EchartsSeriesData()
                 {
@@ -252,7 +252,7 @@ namespace DOAN.Service.MES.SmartScreen.Product
 
             var result = Context.Queryable<ProWorkorder>()
                 .LeftJoin<ProReportwork01>((w, r) => w.Workorder == r.Workorder)
-                .Where((w, r) => w.WorkorderDate >= firstDayOfMonth && w.WorkorderDate <= lastDayOfMonth)
+                .Where((w, r) => w.Status == 1 && w.WorkorderDate >= firstDayOfMonth && w.WorkorderDate <= lastDayOfMonth)
                 .GroupBy((w, r) => w.WorkorderDate)
                 .Select((w, r) => new EchartsSeriesData()
                 {
@@ -283,7 +283,7 @@ namespace DOAN.Service.MES.SmartScreen.Product
                 var GroupresultList = Context.Queryable<ProWorkorder>()
                     .LeftJoin<ProReportwork01>((w, r) => w.Workorder == r.Workorder)
                     .Where((w, r) => groupArray.Contains(w.GroupCode))
-                    .Where((w, r) => w.WorkorderDate >= firstDayOfMonth && w.WorkorderDate <= lastDayOfMonth)
+                    .Where((w, r) => w.Status == 1 && w.WorkorderDate >= firstDayOfMonth && w.WorkorderDate <= lastDayOfMonth)
                     .GroupBy((w, r) => new { w.GroupCode, w.WorkorderDate })
                     .Select((w, r) => new
                     {