diff --git a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/Product2Controller.cs b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/Product2Controller.cs index 7ebb3a3..4180076 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/Product2Controller.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/Product2Controller.cs @@ -72,7 +72,6 @@ namespace DOAN.WebApi.Controllers.MES.BigScreen /// 上周各班组计划完成率统计 /// /// - [HttpGet("getMoudle04")] public IActionResult GetMoudle04() { @@ -138,6 +137,7 @@ namespace DOAN.WebApi.Controllers.MES.BigScreen } + //本月每天产量 [HttpGet("getMoudle08")] public IActionResult GetMoudle08() { @@ -159,7 +159,6 @@ namespace DOAN.WebApi.Controllers.MES.BigScreen { var response = productBigScreenService.AccumulateReportWork(groupCode); return SUCCESS(response); - } } } \ No newline at end of file diff --git a/DOAN.Admin.WebApi/appsettings.Development.json b/DOAN.Admin.WebApi/appsettings.Development.json index 4d85919..5965398 100644 --- a/DOAN.Admin.WebApi/appsettings.Development.json +++ b/DOAN.Admin.WebApi/appsettings.Development.json @@ -45,7 +45,7 @@ "TokenType": "Bearer" }, "InjectClass": [ "DOAN.Repository", "DOAN.Service", "DOAN.Tasks", "DOAN.ServiceCore" ], //自动注入类 - "ShowDbLog": false, //是否打印db日志 + "ShowDbLog": true, //是否打印db日志 "InitDb": false, //是否初始化db "DemoMode": false, //是否演示模式 "SingleLogin": false, //是否单点登录 diff --git a/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs b/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs index 3f51b93..ae7b2a2 100644 --- a/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs +++ b/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs @@ -552,12 +552,12 @@ namespace DOAN.Service.MES.bigScreen { EchartsOptions echartsOptions = new EchartsOptions(); - echartsOptions.Title = new EchartsTitle("获取各时段各组累计报工数折线图", "获取各时段各组累计报工数折线图"); + echartsOptions.Title = new EchartsTitle("获取各时段各组累计完工数折线图", "获取各时段各组累计完工数折线图"); //横轴 8:00 20:00 每10分钟累加一次 // 1.获取这个班组工作时间 GroupShift Shifts = Context.Queryable().LeftJoin((sc, sh) => sc.FkShift == sh.Id) - .Where((sc, sh) => sc.ScheduleDate == DateTime.Today).Select((sc, sh) => sh).First(); + .Where((sc, sh) => sc.ScheduleDate == DateTime.Today&&sc.GroupCode== groupCode).Select((sc, sh) => sh).First(); if (Shifts == null) { return null; diff --git a/DOAN.Service/MES/quality/IQC/QcReportService.cs b/DOAN.Service/MES/quality/IQC/QcReportService.cs index 06f3d4a..5163abb 100644 --- a/DOAN.Service/MES/quality/IQC/QcReportService.cs +++ b/DOAN.Service/MES/quality/IQC/QcReportService.cs @@ -76,7 +76,7 @@ namespace DOAN.Service.MES.quality.IQC { DateTime AddDate= endTime.AddDays(1); return Context.Queryable().Where(it => it.CreatedTime >= startTime&&it.CreatedTimeit.Type==2) + .Where(it=>it.Type==1) .ToList(); }