Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

首检添加数据看板

Browse Source
This commit is contained in:
赵正易
2024-06-07 11:04:26 +08:00
parent c93711290e
commit 769d2da1e0
344 changed files with 1772 additions and 2526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ZR.Admin.WebApi/Controllers/mes/op/OperationController.cs
View File

@@ -1,19 +1,6 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.SignalR;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Hubs;
using ZR.Model.mes.md;
using Microsoft.AspNetCore.Mvc;
using ZR.Model.MES.op.DTO;
using ZR.Model.MES.op.ZR.Model.mes.md;
using ZR.Service.mes.md;
using ZR.Service.MES.md;
using ZR.Service.MES.md.IService;
using ZR.Service.MES.op;
using ZR.Service.MES.op.IService;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace ZR.Admin.WebApi.Controllers.MES.md
{
@@ -21,10 +8,11 @@ namespace ZR.Admin.WebApi.Controllers.MES.md
public class OperationController : BaseController
{
private readonly IOperationService operationService;
public OperationController(IOperationService operationService) {
this.operationService= operationService;
public OperationController(IOperationService operationService)
{
this.operationService = operationService;
}
/// <summary>
/// 获取所有统计信息
@@ -32,12 +20,12 @@ namespace ZR.Admin.WebApi.Controllers.MES.md
/// <param name="workshopid">车间id</param>
/// <returns></returns>
[HttpGet("getOperation")]
public IActionResult GetActionResult(string WorkerID = "1")
public IActionResult GetActionResult(string WorkerID = "1")
{
List<OpStatisticsDTO> OpStatisticsList= operationService.GetAllData(WorkerID);
List<OpStatisticsDTO> OpStatisticsList = operationService.GetAllData(WorkerID);
return ToResponse(new ApiResult(200, "success", OpStatisticsList));
}
}
}

10
ZR.Admin.WebApi/Controllers/mes/op/quality/QualityStatisticsController.cs
View File

@@ -1,7 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.mes.pro;
using ZR.Model.MES.op.DTO;
using ZR.Service.mes.pro;
using ZR.Service.MES.op.IService;
namespace ZR.Admin.WebApi.Controllers.mes.op.quality
@@ -31,12 +29,12 @@ namespace ZR.Admin.WebApi.Controllers.mes.op.quality
[HttpGet("gueryQualityStatisticsTable")]
public IActionResult GueryQualityStatisticsTable(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1, string workorderid = "")
{
(List<QcFqcDTO>, int) data = operationService.GueryQualityStatistics(workorderid,pageNum, pageSize, year, week, date);
(List<QcFqcDTO>, int) data = operationService.GueryQualityStatistics(workorderid, pageNum, pageSize, year, week, date);
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
/// 获取缺陷项详情
/// </summary>
@@ -44,9 +42,9 @@ namespace ZR.Admin.WebApi.Controllers.mes.op.quality
/// <param name="order">缺陷项类型</param>
/// <returns></returns>
[HttpGet("QueryDetailsOfDetectionItems")]
public IActionResult QueryDetailsOfDetectionItems(string fkWorkorderId,int index)
public IActionResult QueryDetailsOfDetectionItems(string fkWorkorderId, int index)
{
List<DetailsOfDetectionDTO> data= operationService.QueryDetailsOfDetection(fkWorkorderId, index);
List<DetailsOfDetectionDTO> data = operationService.QueryDetailsOfDetection(fkWorkorderId, index);
return ToResponse(new ApiResult(200, "success", data));
}