From e2e209bfb0b4fa60c4bc547aa45376edd8b91534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Tue, 21 May 2024 09:55:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=EF=BC=8C?= =?UTF-8?q?=E5=8C=85=E8=A3=85=EF=BC=8C=E9=A6=96=E6=A3=80=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=A4=84=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/qc/FQC/FirstFQCController.cs | 22 +++++++++++++++++-- .../IQcQualityStatisticsFirstService.cs | 6 +++++ .../mes/qc/QcQualityStatisticsFirstService.cs | 22 ++++++++++++++++++- 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/mes/qc/FQC/FirstFQCController.cs b/ZR.Admin.WebApi/Controllers/mes/qc/FQC/FirstFQCController.cs index bd69d24a..173e78c1 100644 --- a/ZR.Admin.WebApi/Controllers/mes/qc/FQC/FirstFQCController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/qc/FQC/FirstFQCController.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.SignalR; using Microsoft.IdentityModel.Tokens; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using NPOI.POIFS.Crypt.Dsig; using Org.BouncyCastle.Asn1.X509; using System.Text.Json; using ZR.Admin.WebApi.Extensions; @@ -24,12 +25,14 @@ namespace ZR.Admin.WebApi.Controllers.mes.qc.IQC public class FirstFQCController : BaseController { private readonly IFirstFQCService fQCService; + private readonly IQcQualityStatisticsFirstService qQCQualityStatisticsFirstService; private readonly IHubContext hubContext; - public FirstFQCController(IFirstFQCService fQCService, IHubContext hubContext) + public FirstFQCController(IFirstFQCService fQCService, IHubContext hubContext, IQcQualityStatisticsFirstService qQCQualityStatisticsFirstService) { this.fQCService = fQCService; this.hubContext = hubContext; + this.qQCQualityStatisticsFirstService = qQCQualityStatisticsFirstService; } @@ -311,7 +314,22 @@ namespace ZR.Admin.WebApi.Controllers.mes.qc.IQC } - + /// + /// 获取工单号的开始时间 + /// + /// + /// + [HttpGet("getQcQualityStatisticsFirstStartTime")] + public IActionResult GetQcQualityStatisticsFirstStartTime(string workOrderId) + { + if (string.IsNullOrEmpty(workOrderId)) + { + return ToResponse(new ApiResult(500, "工单号传入异常!", "工单号传入异常!")); + } + var result = qQCQualityStatisticsFirstService.GetQcQualityStatisticsFirstStartTime(workOrderId); + return ToResponse(new ApiResult(200, result, result)); + } + } diff --git a/ZR.Service/mes/qc/IService/IQcQualityStatisticsFirstService.cs b/ZR.Service/mes/qc/IService/IQcQualityStatisticsFirstService.cs index c7a71c4f..13557bfe 100644 --- a/ZR.Service/mes/qc/IService/IQcQualityStatisticsFirstService.cs +++ b/ZR.Service/mes/qc/IService/IQcQualityStatisticsFirstService.cs @@ -19,6 +19,12 @@ namespace ZR.Service.mes.qc.IService QcQualityStatisticsFirst AddQcQualityStatisticsFirst(QcQualityStatisticsFirst parm); int UpdateQcQualityStatisticsFirst(QcQualityStatisticsFirst parm); + /// + /// 获取首检工单的开始时间 + /// + /// 工单号 + /// 有则返回时间字符串,无或有问题则返回空字符串 + String GetQcQualityStatisticsFirstStartTime(string workOrderId); } } diff --git a/ZR.Service/mes/qc/QcQualityStatisticsFirstService.cs b/ZR.Service/mes/qc/QcQualityStatisticsFirstService.cs index b41f83ce..8243bfb5 100644 --- a/ZR.Service/mes/qc/QcQualityStatisticsFirstService.cs +++ b/ZR.Service/mes/qc/QcQualityStatisticsFirstService.cs @@ -9,6 +9,7 @@ using ZR.Service.mes.qc.IService; using ZR.Model.MES.qc; using ZR.Model.MES.qc.DTO; using ZR.Model; +using ZR.Model.MES.pro; namespace ZR.Service.mes.qc { @@ -134,6 +135,25 @@ namespace ZR.Service.mes.qc } - + public string GetQcQualityStatisticsFirstStartTime(string workOrderId) + { + try + { + ProWorkordertimeStep proWorkordertime = Context.Queryable() + .Where(it=>it.WorkoderId == workOrderId) + .First(); + if(proWorkordertime == null) + { + return "工单无开始时间!"; + } + string timeStr = proWorkordertime.FirstInspectTime?.ToString("yyyy-MM-dd HH:mm:ss"); + return timeStr; + } + catch (Exception ex) + { + return "工单无开始时间!"; + } + + } } } \ No newline at end of file