RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

获取各时段各组累计完工数折线图

Browse Source
This commit is contained in:
qianhao.xu 2024-12-23 11:35:16 +08:00
parent 0503dce5b7
commit 3a44daaa55
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/Product2Controller.cs
View File

@ -72,7 +72,6 @@ namespace DOAN.WebApi.Controllers.MES.BigScreen
/// 上周各班组计划完成率统计
/// </summary>
/// <returns></returns>
[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);
}
}
}

2
DOAN.Admin.WebApi/appsettings.Development.json
View File

@ -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, //是否单点登录

4
DOAN.Service/MES/bigScreen/Product2BigScreenService.cs
View File

@ -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<GroupSchedule>().LeftJoin<GroupShift>((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;

2
DOAN.Service/MES/quality/IQC/QcReportService.cs
View File

@ -76,7 +76,7 @@ namespace DOAN.Service.MES.quality.IQC
{
DateTime AddDate= endTime.AddDays(1);
return Context.Queryable<QcDefectCollection>().Where(it => it.CreatedTime >= startTime&&it.CreatedTime<AddDate)
.Where(it=>it.Type==2)
.Where(it=>it.Type==1)
.ToList();
}