diff --git a/ZR.Admin.WebApi/Controllers/mes/qc/FQC/defectReport/DefectReportController.cs b/ZR.Admin.WebApi/Controllers/mes/qc/FQC/defectReport/DefectReportController.cs new file mode 100644 index 00000000..54ba6c8c --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/qc/FQC/defectReport/DefectReportController.cs @@ -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; + } + + + } +} diff --git a/ZR.Admin.WebApi/Controllers/mes/qc/FQC/qualificationRateReport/QualificationRateReportController.cs b/ZR.Admin.WebApi/Controllers/mes/qc/FQC/qualificationRateReport/QualificationRateReportController.cs new file mode 100644 index 00000000..b6e9c1e6 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/qc/FQC/qualificationRateReport/QualificationRateReportController.cs @@ -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; + } + + /// + /// 分页获取合格率报表数据 + /// + /// 查询值 + /// QcCommonFqcBoardDto 看板数据 + [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)); + } + } + } +} diff --git a/ZR.Model/MES/qc/DTO/defectReport/DefectReportDTO.cs b/ZR.Model/MES/qc/DTO/defectReport/DefectReportDTO.cs new file mode 100644 index 00000000..a156f601 --- /dev/null +++ b/ZR.Model/MES/qc/DTO/defectReport/DefectReportDTO.cs @@ -0,0 +1,166 @@ +namespace ZR.Model.MES.DTO +{ + public class DefectReportDTO + { + /// + /// 序号 + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] + public string Id { get; set; } + + /// + /// 工单号 + /// + public string WorkOrder { get; set; } + + /// + /// 零件号 + /// + public string PartNumber { get; set; } + + /// + /// 零件描述 + /// + public string Description { get; set; } + + /// + /// 规格 + /// + public string Specification { get; set; } + + /// + /// 颜色 + /// + public string Color { get; set; } + + /// + /// 班组 + /// + public string Team { get; set; } + + /// + /// 站点号 + /// + public string SiteNo { get; set; } + + /// + /// 串口号 + /// + public string ComNo { get; set; } + + /// + /// 是否一次合格 + /// + public int? IsOnetime { get; set; } + + /// + /// 是否返工件 + /// + public int? IsBack { get; set; } + + /// + /// 是否抛光件 + /// + public int? IsPolish { get; set; } + + /// + /// 是否外部件 + /// + public int? IsOut { get; set; } + + /// + /// 开始时间 + /// + public DateTime? StartTime { get; set; } + + /// + /// 结束时间 + /// + public DateTime? EndTime { get; set; } + + /// + /// 箱标签记录 + /// + public string Label { get; set; } + + /// + /// 投入数 + /// + public int? RequireNumber { get; set; } + + /// + /// 合格数 + /// + public int? QualifiedNumber { get; set; } + + /// + /// 合格率 + /// + public string QualifiedRate { get; set; } + + /// + /// 抛光数 + /// + public int? PolishNumber { get; set; } + + /// + /// 打磨数 + /// + public int? DamoNumber { get; set; } + + /// + /// 报废数 + /// + public int? BaofeiNumber { get; set; } + + /// + /// 同组标识 + /// + public string GroupCode { get; set; } + + /// + /// 同组顺序 + /// + public int? GroupSort { get; set; } + + /// + /// 同组缺陷记录 + /// + public string GroupDefectJson { get; set; } + + /// + /// 系统类别 + /// + public string Type { get; set; } + + /// + /// 系统状态 + /// + public string Status { get; set; } + + /// + /// 系统备注 + /// + public string Remark { get; set; } + + /// + /// 创建人 + /// + public string CreatedBy { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreatedTime { get; set; } + + /// + /// 更新人 + /// + public string UpdatedBy { get; set; } + + /// + /// 更新时间 + /// + public DateTime? UpdatedTime { get; set; } + } +} diff --git a/ZR.Model/MES/qc/DTO/qualificationRateReport/QualificationRateReportDTO.cs b/ZR.Model/MES/qc/DTO/qualificationRateReport/QualificationRateReportDTO.cs new file mode 100644 index 00000000..08040c90 --- /dev/null +++ b/ZR.Model/MES/qc/DTO/qualificationRateReport/QualificationRateReportDTO.cs @@ -0,0 +1,187 @@ +namespace ZR.Model.MES.DTO +{ + + public class QualificationRateReportQueryDTO + { + /// + /// 零件号 + /// + public string PartNumber { get; set; } + /// + /// 零件描述 + /// + public string Description { get; set; } + /// + /// 开始时间 + /// + public DateTime? StartTime { get; set; } + /// + /// 结束时间 + /// + public DateTime? EndTime { get; set; } + } + + public class QualificationRateReportDTO + { + /// + /// 序号 + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] + public string Id { get; set; } + + /// + /// 工单号 + /// + public string WorkOrder { get; set; } + + /// + /// 零件号 + /// + public string PartNumber { get; set; } + + /// + /// 零件描述 + /// + public string Description { get; set; } + + /// + /// 规格 + /// + public string Specification { get; set; } + + /// + /// 颜色 + /// + public string Color { get; set; } + + /// + /// 班组 + /// + public string Team { get; set; } + + /// + /// 站点号 + /// + public string SiteNo { get; set; } + + /// + /// 串口号 + /// + public string ComNo { get; set; } + + /// + /// 是否一次合格 + /// + public int? IsOnetime { get; set; } + + /// + /// 是否返工件 + /// + public int? IsBack { get; set; } + + /// + /// 是否抛光件 + /// + public int? IsPolish { get; set; } + + /// + /// 是否外部件 + /// + public int? IsOut { get; set; } + + /// + /// 开始时间 + /// + public DateTime? StartTime { get; set; } + + /// + /// 结束时间 + /// + public DateTime? EndTime { get; set; } + + /// + /// 箱标签记录 + /// + public string Label { get; set; } + + /// + /// 投入数 + /// + public int? RequireNumber { get; set; } + + /// + /// 合格数 + /// + public int? QualifiedNumber { get; set; } + + /// + /// 合格率 + /// + public string QualifiedRate { get; set; } + + /// + /// 抛光数 + /// + public int? PolishNumber { get; set; } + + /// + /// 打磨数 + /// + public int? DamoNumber { get; set; } + + /// + /// 报废数 + /// + public int? BaofeiNumber { get; set; } + + /// + /// 同组标识 + /// + public string GroupCode { get; set; } + + /// + /// 同组顺序 + /// + public int? GroupSort { get; set; } + + /// + /// 同组缺陷记录 + /// + public string GroupDefectJson { get; set; } + + /// + /// 系统类别 + /// + public string Type { get; set; } + + /// + /// 系统状态 + /// + public string Status { get; set; } + + /// + /// 系统备注 + /// + public string Remark { get; set; } + + /// + /// 创建人 + /// + public string CreatedBy { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreatedTime { get; set; } + + /// + /// 更新人 + /// + public string UpdatedBy { get; set; } + + /// + /// 更新时间 + /// + public DateTime? UpdatedTime { get; set; } + } +} diff --git a/ZR.Model/ZR.Model.csproj b/ZR.Model/ZR.Model.csproj index c313740a..360fce37 100644 --- a/ZR.Model/ZR.Model.csproj +++ b/ZR.Model/ZR.Model.csproj @@ -24,4 +24,9 @@ + + + + + diff --git a/ZR.Service/ZR.Service.csproj b/ZR.Service/ZR.Service.csproj index 0da804f5..5d766791 100644 --- a/ZR.Service/ZR.Service.csproj +++ b/ZR.Service/ZR.Service.csproj @@ -22,6 +22,7 @@ + diff --git a/ZR.Service/mes/qc/IService/defectReport/IDefectReportService.cs b/ZR.Service/mes/qc/IService/defectReport/IDefectReportService.cs new file mode 100644 index 00000000..e1759fdf --- /dev/null +++ b/ZR.Service/mes/qc/IService/defectReport/IDefectReportService.cs @@ -0,0 +1,9 @@ + +namespace ZR.Service.mes.IService +{ + public interface IDefectReportService + { + + + } +} diff --git a/ZR.Service/mes/qc/IService/qualificationRateReport/IQualificationRateReportService.cs b/ZR.Service/mes/qc/IService/qualificationRateReport/IQualificationRateReportService.cs new file mode 100644 index 00000000..89df91ce --- /dev/null +++ b/ZR.Service/mes/qc/IService/qualificationRateReport/IQualificationRateReportService.cs @@ -0,0 +1,16 @@ + +using ZR.Model; +using ZR.Model.MES.DTO; + +namespace ZR.Service.mes.IService +{ + public interface IQualificationRateReportService + { + /// + /// 分页获取合格率报表 + /// + /// + /// + PagedInfo GetQualificationRateReport(QualificationRateReportQueryDTO parms); + } +} diff --git a/ZR.Service/mes/qc/qualificationRateReport/QualificationRateReportService.cs b/ZR.Service/mes/qc/qualificationRateReport/QualificationRateReportService.cs new file mode 100644 index 00000000..5e436837 --- /dev/null +++ b/ZR.Service/mes/qc/qualificationRateReport/QualificationRateReportService.cs @@ -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, IQualificationRateReportService + { + public PagedInfo GetQualificationRateReport(QualificationRateReportQueryDTO parms) + { + throw new global::System.NotImplementedException(); + } + } +}