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

线 任务数/工单数

Browse Source
This commit is contained in:
qianhao.xu 2024-11-07 13:40:44 +08:00
parent cbaee5afb8
commit 8acc43b565
4 changed files with 179 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
DOAN.Admin.WebApi/Controllers/MES/Console/ConsoleController.cs
View File

@ -14,9 +14,9 @@ public class ConsoleController : BaseController
{
private readonly IConsoleService consoleService;
public ConsoleController(IConsoleService consoleService)
public ConsoleController(IConsoleService consoleService)
{
this.consoleService=consoleService;
this.consoleService = consoleService;
}
//TODO 获取色块看板信息
@ -31,6 +31,15 @@ public class ConsoleController : BaseController
return SUCCESS(response);
}
//TODO 线 物料需求数 / 物料备料数
//TODO 线 任务数/工单数
[HttpGet("get_moudel02")]
public IActionResult GetLineOfTaskNumAndWorkorder()
{
var response = consoleService.GetLineOfTaskNumAndWorkorder();
return SUCCESS(response);
}
}

93
DOAN.Model/echarts/EchartsDto.cs Normal file
View File

@ -0,0 +1,93 @@
using Newtonsoft.Json.Converters;
namespace DOAN.Model.mes.echarts
{
/// <summary>
/// echarts 通用Options返回值
/// </summary>
public class EchartsOptions
{
public EchartsTitle Title { get; set; } = null;
public EchartsXAxis XAxis { get; set; } = null;
public EchartsYAxis YAxis { get; set; } = null;
public List<EchartsSeries> Series { get; set; } = new List<EchartsSeries>();
}
/// <summary>
/// echarts图表标题
///</summary>
public class EchartsTitle
{
public string Text { get; set; } = string.Empty;
public string SubText { get; set; } = string.Empty;
}
/// <summary>
/// echarts X轴
///</summary>
public class EchartsXAxis
{
public List<string> Data { get; set; } = new List<string>();
// value 数值轴，适用于连续数据 category 类目轴，适用于离散的类目数据 time 时间轴，适用于连续的时序数据 log 对数轴。适用于对数数据
public string Type { get; set; } = "category";
public string Max { get; set; }
public string Min { get; set; }
}
/// <summary>
/// echarts Y轴
///</summary>
public class EchartsYAxis
{
public List<string> Data { get; set; } = new List<string>();
// value 数值轴，适用于连续数据 category 类目轴，适用于离散的类目数据 time 时间轴，适用于连续的时序数据 log 对数轴。适用于对数数据
public string Type { get; set; } = "category";
public string Max { get; set; }
public string Min { get; set; }
}
/// <summary>
/// echarts图表series返回值
///</summary>
public class EchartsSeries
{
/// <summary>
/// 标签名称
/// </summary>
public string Name { get; set; } = "category";
/// <summary>
/// bar-柱状图 line-折线图 EchartsSeriesType enum结构
/// </summary>
public string Type { get; set; } = "bar";
/// <summary>
/// 参数值
/// </summary>
public List<EchartsSeriesData> Data { get; set; } = new List<EchartsSeriesData>();
}
/// <summary>
/// echarts图表series返回值内容
///</summary>
public class EchartsSeriesData
{
/// <summary>
/// 标签名称
/// </summary>
public string Name { get; set; } = string.Empty;
/// <summary>
/// 参数值
/// </summary>
public decimal Value { get; set; } = new decimal();
}
}

69
DOAN.Service/MES/Console_/ConsoleService.cs
View File

@ -1,4 +1,6 @@
using DOAN.Model.mes.echarts;
using DOAN.Model.MES.andon;
using DOAN.Model.MES.base_;
using DOAN.Model.MES.console;
using DOAN.Model.MES.dev;
using DOAN.Model.MES.mm;
@ -7,6 +9,7 @@ using DOAN.Model.MES.quality.FQC;
using DOAN.Model.MES.quality.IPQC;
using DOAN.Service.MES.Console_.IService;
using Infrastructure.Attribute;
using System.Collections.Generic;
namespace DOAN.Service.MES.Console_;
@ -57,4 +60,70 @@ public class ConsoleService : BaseService<ProWorkorder>, IConsoleService
});
return consoleMoudle01;
}
/// <summary>
/// 获取线 任务数/工单数
/// </summary>
/// <returns></returns>
public EchartsOptions GetLineOfTaskNumAndWorkorder()
{
EchartsOptions echartsOptions = new EchartsOptions();
EchartsTitle Title=new EchartsTitle();
Title.Text = "今日产线产能";
Title.SubText = "今日产线工单和任务数对比";
echartsOptions.Title = Title;
EchartsXAxis XAxis=new EchartsXAxis();
XAxis.Type = "category";
XAxis.Data =Context.Queryable<BaseWorkRoute>().OrderBy(it=>it.Code).Select(it => it.Name).ToList();
echartsOptions.XAxis = XAxis;
EchartsYAxis YAxis=new EchartsYAxis();
YAxis.Type = "value";
echartsOptions.YAxis = YAxis;
List<EchartsSeries> Series=new List<EchartsSeries>();
EchartsSeries serie01 = new EchartsSeries();
serie01.Name = "工单数";
serie01.Type = "bar";
List<EchartsSeriesData> EchartsSeriesDataList = Context.Queryable<BaseWorkRoute>().LeftJoin<ProWorkorder>((r, w) => r.Code == w.LineCode)
.Where((r,w)=>w.WorkorderDate == DateTime.Now.Date)
.OrderBy((r, w) => r.Code)
.GroupBy((r, w) => r.Name)
.Select((r, w) => new EchartsSeriesData {
Name=r.Name,
Value=SqlFunc.AggregateCount(w)
}).ToList();
serie01.Data = EchartsSeriesDataList;
Series.Add(serie01);
EchartsSeries serie02 = new EchartsSeries();
serie02.Name = "任务数";
serie02.Type = "bar";
List<EchartsSeriesData> EchartsSeriesDataList02 = Context.Queryable<BaseWorkRoute>().LeftJoin<MmPreparationTaskLine>((r, w) => r.Code == w.LineCode)
.Where((r, w) => w.TaskDate == DateTime.Now.Date)
.OrderBy((r, w) => r.Code)
.GroupBy((r, w) => r.Name)
.Select((r, w) => new EchartsSeriesData
{
Name = r.Name,
Value = SqlFunc.AggregateCount(w)
}).ToList();
serie02.Data = EchartsSeriesDataList;
Series.Add(serie02);
echartsOptions.Series= Series;
return echartsOptions;
}
}

6
DOAN.Service/MES/Console_/IService/IConsoleService.cs
View File

@ -2,11 +2,15 @@
using DOAN.Model.MES.console;
using DOAN.Model.MES.product;
using DOAN.Model.mes.echarts;
namespace DOAN.Service.MES.Console_.IService;
public interface IConsoleService : IBaseService<ProWorkorder>
{
ConsoleMoudle01 GetColorBlockKanbanInformation();
ConsoleMoudle01 GetColorBlockKanbanInformation();
EchartsOptions GetLineOfTaskNumAndWorkorder();
}