缺陷报表与合格率报表基础框架搭建
This commit is contained in:
@@ -0,0 +1,19 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using ZR.Model.MES.qc.DTO;
|
||||
using ZR.Service.mes.qu.IService;
|
||||
|
||||
namespace ZR.Admin.WebApi.Controllers.mes.qu
|
||||
{
|
||||
[Route("mes/qc/FQC/DefectReport")]
|
||||
public class DefectReportController : BaseController
|
||||
{
|
||||
private readonly IQcRoughService quRoughService;
|
||||
|
||||
public DefectReportController(IQcRoughService quRoughService)
|
||||
{
|
||||
this.quRoughService = quRoughService;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using ZR.Model.MES.DTO;
|
||||
using ZR.Model.MES.qc.DTO;
|
||||
using ZR.Service.mes.IService;
|
||||
using ZR.Service.mes.qu.IService;
|
||||
|
||||
namespace ZR.Admin.WebApi.Controllers.mes.qu
|
||||
{
|
||||
[Route("mes/qc/FQC/QualificationRateReport")]
|
||||
public class QualificationRateReportController : BaseController
|
||||
{
|
||||
private readonly IQualificationRateReportService qualificationRateReportService;
|
||||
|
||||
public QualificationRateReportController(
|
||||
IQualificationRateReportService qualificationRateReportService
|
||||
)
|
||||
{
|
||||
this.qualificationRateReportService = qualificationRateReportService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 分页获取合格率报表数据
|
||||
/// </summary>
|
||||
/// <param name="query">查询值</param>
|
||||
/// <returns>QcCommonFqcBoardDto 看板数据</returns>
|
||||
[HttpPost("getWorkOrderFqcTableData")]
|
||||
public IActionResult GetWorkOrderFqcTableData(
|
||||
[FromBody] QualificationRateReportQueryDTO query
|
||||
)
|
||||
{
|
||||
try
|
||||
{
|
||||
var result = qualificationRateReportService.GetQualificationRateReport(query);
|
||||
if (result == null)
|
||||
{
|
||||
return ToResponse(new ApiResult(500, "获取数据列表异常-01:返回值为空", result));
|
||||
}
|
||||
return ToResponse(new ApiResult(200, "ok", result));
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return ToResponse(new ApiResult(500, ex.Message, ex.Message));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
166
ZR.Model/MES/qc/DTO/defectReport/DefectReportDTO.cs
Normal file
166
ZR.Model/MES/qc/DTO/defectReport/DefectReportDTO.cs
Normal file
@@ -0,0 +1,166 @@
|
||||
namespace ZR.Model.MES.DTO
|
||||
{
|
||||
public class DefectReportDTO
|
||||
{
|
||||
/// <summary>
|
||||
/// 序号
|
||||
/// </summary>
|
||||
[SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
|
||||
public string Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 工单号
|
||||
/// </summary>
|
||||
public string WorkOrder { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 零件号
|
||||
/// </summary>
|
||||
public string PartNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 零件描述
|
||||
/// </summary>
|
||||
public string Description { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 规格
|
||||
/// </summary>
|
||||
public string Specification { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 颜色
|
||||
/// </summary>
|
||||
public string Color { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 班组
|
||||
/// </summary>
|
||||
public string Team { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 站点号
|
||||
/// </summary>
|
||||
public string SiteNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 串口号
|
||||
/// </summary>
|
||||
public string ComNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否一次合格
|
||||
/// </summary>
|
||||
public int? IsOnetime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否返工件
|
||||
/// </summary>
|
||||
public int? IsBack { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否抛光件
|
||||
/// </summary>
|
||||
public int? IsPolish { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否外部件
|
||||
/// </summary>
|
||||
public int? IsOut { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 开始时间
|
||||
/// </summary>
|
||||
public DateTime? StartTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 结束时间
|
||||
/// </summary>
|
||||
public DateTime? EndTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 箱标签记录
|
||||
/// </summary>
|
||||
public string Label { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 投入数
|
||||
/// </summary>
|
||||
public int? RequireNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 合格数
|
||||
/// </summary>
|
||||
public int? QualifiedNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 合格率
|
||||
/// </summary>
|
||||
public string QualifiedRate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 抛光数
|
||||
/// </summary>
|
||||
public int? PolishNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 打磨数
|
||||
/// </summary>
|
||||
public int? DamoNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 报废数
|
||||
/// </summary>
|
||||
public int? BaofeiNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 同组标识
|
||||
/// </summary>
|
||||
public string GroupCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 同组顺序
|
||||
/// </summary>
|
||||
public int? GroupSort { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 同组缺陷记录
|
||||
/// </summary>
|
||||
public string GroupDefectJson { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 系统类别
|
||||
/// </summary>
|
||||
public string Type { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 系统状态
|
||||
/// </summary>
|
||||
public string Status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 系统备注
|
||||
/// </summary>
|
||||
public string Remark { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建人
|
||||
/// </summary>
|
||||
public string CreatedBy { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间
|
||||
/// </summary>
|
||||
public DateTime? CreatedTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 更新人
|
||||
/// </summary>
|
||||
public string UpdatedBy { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 更新时间
|
||||
/// </summary>
|
||||
public DateTime? UpdatedTime { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,187 @@
|
||||
namespace ZR.Model.MES.DTO
|
||||
{
|
||||
|
||||
public class QualificationRateReportQueryDTO
|
||||
{
|
||||
/// <summary>
|
||||
/// 零件号
|
||||
/// </summary>
|
||||
public string PartNumber { get; set; }
|
||||
/// <summary>
|
||||
/// 零件描述
|
||||
/// </summary>
|
||||
public string Description { get; set; }
|
||||
/// <summary>
|
||||
/// 开始时间
|
||||
/// </summary>
|
||||
public DateTime? StartTime { get; set; }
|
||||
/// <summary>
|
||||
/// 结束时间
|
||||
/// </summary>
|
||||
public DateTime? EndTime { get; set; }
|
||||
}
|
||||
|
||||
public class QualificationRateReportDTO
|
||||
{
|
||||
/// <summary>
|
||||
/// 序号
|
||||
/// </summary>
|
||||
[SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
|
||||
public string Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 工单号
|
||||
/// </summary>
|
||||
public string WorkOrder { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 零件号
|
||||
/// </summary>
|
||||
public string PartNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 零件描述
|
||||
/// </summary>
|
||||
public string Description { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 规格
|
||||
/// </summary>
|
||||
public string Specification { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 颜色
|
||||
/// </summary>
|
||||
public string Color { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 班组
|
||||
/// </summary>
|
||||
public string Team { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 站点号
|
||||
/// </summary>
|
||||
public string SiteNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 串口号
|
||||
/// </summary>
|
||||
public string ComNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否一次合格
|
||||
/// </summary>
|
||||
public int? IsOnetime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否返工件
|
||||
/// </summary>
|
||||
public int? IsBack { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否抛光件
|
||||
/// </summary>
|
||||
public int? IsPolish { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否外部件
|
||||
/// </summary>
|
||||
public int? IsOut { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 开始时间
|
||||
/// </summary>
|
||||
public DateTime? StartTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 结束时间
|
||||
/// </summary>
|
||||
public DateTime? EndTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 箱标签记录
|
||||
/// </summary>
|
||||
public string Label { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 投入数
|
||||
/// </summary>
|
||||
public int? RequireNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 合格数
|
||||
/// </summary>
|
||||
public int? QualifiedNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 合格率
|
||||
/// </summary>
|
||||
public string QualifiedRate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 抛光数
|
||||
/// </summary>
|
||||
public int? PolishNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 打磨数
|
||||
/// </summary>
|
||||
public int? DamoNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 报废数
|
||||
/// </summary>
|
||||
public int? BaofeiNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 同组标识
|
||||
/// </summary>
|
||||
public string GroupCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 同组顺序
|
||||
/// </summary>
|
||||
public int? GroupSort { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 同组缺陷记录
|
||||
/// </summary>
|
||||
public string GroupDefectJson { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 系统类别
|
||||
/// </summary>
|
||||
public string Type { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 系统状态
|
||||
/// </summary>
|
||||
public string Status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 系统备注
|
||||
/// </summary>
|
||||
public string Remark { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建人
|
||||
/// </summary>
|
||||
public string CreatedBy { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间
|
||||
/// </summary>
|
||||
public DateTime? CreatedTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 更新人
|
||||
/// </summary>
|
||||
public string UpdatedBy { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 更新时间
|
||||
/// </summary>
|
||||
public DateTime? UpdatedTime { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -24,4 +24,9 @@
|
||||
<ItemGroup>
|
||||
<None Remove="Models\**" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="MES\qc\defectReport\" />
|
||||
<Folder Include="MES\qc\qualificationRateReport\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="mes\qc\defectReport\" />
|
||||
<Folder Include="mqtt\" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
|
||||
namespace ZR.Service.mes.IService
|
||||
{
|
||||
public interface IDefectReportService
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
|
||||
using ZR.Model;
|
||||
using ZR.Model.MES.DTO;
|
||||
|
||||
namespace ZR.Service.mes.IService
|
||||
{
|
||||
public interface IQualificationRateReportService
|
||||
{
|
||||
/// <summary>
|
||||
/// 分页获取合格率报表
|
||||
/// </summary>
|
||||
/// <param name="parms"></param>
|
||||
/// <returns></returns>
|
||||
PagedInfo<QualificationRateReportDTO> GetQualificationRateReport(QualificationRateReportQueryDTO parms);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
using Infrastructure.Attribute;
|
||||
using SqlSugar;
|
||||
using ZR.Model;
|
||||
using ZR.Model.MES.DTO;
|
||||
using ZR.Model.MES.qc;
|
||||
using ZR.Model.MES.qu;
|
||||
using ZR.Service.mes.IService;
|
||||
using ZR.Service.mes.qc.IService;
|
||||
|
||||
namespace ZR.Service.mes.qc
|
||||
{
|
||||
[AppService(ServiceType = typeof(IQualificationRateReportService), ServiceLifetime = LifeTime.Transient)]
|
||||
public class QualificationRateReportService : BaseService<QcQualityStatisticsFirst>, IQualificationRateReportService
|
||||
{
|
||||
public PagedInfo<QualificationRateReportDTO> GetQualificationRateReport(QualificationRateReportQueryDTO parms)
|
||||
{
|
||||
throw new global::System.NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user