Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

大屏

Browse Source
This commit is contained in:
卢江海
2025-03-27 16:15:33 +08:00
parent 9c916d58e8
commit 246e4b69b7
3 changed files with 10 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Order/OrderSmartController.cs
View File

@@ -32,6 +32,7 @@ namespace DOAN.Admin.WebApi.Controllers.MES.SmartScreen.Order
/// </summary>
/// <returns></returns>
[HttpGet("GetLargeScreenOrder")]
[AllowAnonymous]
public IActionResult GetLargeScreenOrder()
{
@@ -44,6 +45,7 @@ namespace DOAN.Admin.WebApi.Controllers.MES.SmartScreen.Order
/// </summary>
/// <returns></returns>
[HttpGet("GetOrderProgress")]
[AllowAnonymous]
public IActionResult GetOrderProgress()
{

2
DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Quality/QualitySmartController.cs
View File

@@ -29,6 +29,7 @@ namespace DOAN.Admin.WebApi.Controllers.MES.SmartScreen.Quality
/// </summary>
/// <returns></returns>
[HttpGet("GetQualityScreenHead")]
[AllowAnonymous]
public IActionResult GetQualityScreenHead()
{
@@ -41,6 +42,7 @@ namespace DOAN.Admin.WebApi.Controllers.MES.SmartScreen.Quality
/// </summary>
/// <returns></returns>
[HttpGet("GetQualitySmartScreenForWeek")]
[AllowAnonymous]
public IActionResult GetQualitySmartScreenForWeek()
{

46
DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs
View File

@@ -61,28 +61,10 @@ namespace DOAN.Service.MES.SmartScreen.Quality
.AddMinutes(59)
.AddSeconds(59);
// 查询本周的质量缺陷数据
var defectQuery = Queryable()
.Where(o => o.CheckDatetime >= startOfWeek && o.CheckDatetime <= endOfWeek);
// 获取有缺陷的工单列表
List<string> defectWorkorders = defectQuery
.Select(o => o.Workorder)
.Distinct()
.ToList();
if (defectWorkorders.Count == 0)
{
return new List<QualitySmartScreenDto>();
}
// 查询相关工单信息
var workorderQuery = Context.Queryable<ProWorkorder>()
.Where(o => defectWorkorders.Contains(o.Workorder));
// 使用 SqlSugar 进行联表查询和分组统计
var result = defectQuery
.InnerJoin<ProWorkorder>((defect, work) => defect.Workorder == work.Workorder)
var result = Context.Queryable<QcFinishedproductDefectCollection>()
.LeftJoin<ProWorkorder>((defect, work) => defect.Workorder == work.Workorder)
.Where((defect, work) => defect.CheckDatetime >= startOfWeek && defect.CheckDatetime <= endOfWeek)
.GroupBy((defect, work) => new { work.StoveCode, defect.DefectName })
.Select((defect, work) => new QualitySmartScreenDto
{
@@ -105,28 +87,12 @@ namespace DOAN.Service.MES.SmartScreen.Quality
DateTime lastDayOfMonth = new DateTime(now.Year, now.Month, 1)
.AddMonths(1)
.AddSeconds(-1);
// 查询本周的质量缺陷数据
var defectQuery = Queryable()
.Where(o => o.CheckDatetime >= firstDayOfMonth && o.CheckDatetime <= lastDayOfMonth);
// 获取有缺陷的工单列表
List<string> defectWorkorders = defectQuery
.Select(o => o.Workorder)
.Distinct()
.ToList();
if (defectWorkorders.Count == 0)
{
return new List<QualitySmartScreenDto>();
}
// 查询相关工单信息
var workorderQuery = Context.Queryable<ProWorkorder>()
.Where(o => defectWorkorders.Contains(o.Workorder));
// 使用 SqlSugar 进行联表查询和分组统计
var result = defectQuery
.InnerJoin<ProWorkorder>((defect, work) => defect.Workorder == work.Workorder)
var result = Context.Queryable<QcFinishedproductDefectCollection>()
.LeftJoin<ProWorkorder>((defect, work) => defect.Workorder == work.Workorder)
.Where((defect, work) => defect.CheckDatetime >= firstDayOfMonth && defect.CheckDatetime <= lastDayOfMonth)
.GroupBy((defect, work) => new { work.StoveCode, defect.DefectName })
.Select((defect, work) => new QualitySmartScreenDto
{