From 9e85bc8d4a2d45fe61257ffdc5fc243ccc7a7283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Fri, 12 Jul 2024 15:57:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E7=9C=8B=E6=9D=BF=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/qc/FQC/CommonFQCController.cs | 20 +++++++++++++------ ZR.Service/mes/qc/CommonFQCService.cs | 4 ++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/mes/qc/FQC/CommonFQCController.cs b/ZR.Admin.WebApi/Controllers/mes/qc/FQC/CommonFQCController.cs index 62f36561..32652c0c 100644 --- a/ZR.Admin.WebApi/Controllers/mes/qc/FQC/CommonFQCController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/qc/FQC/CommonFQCController.cs @@ -87,16 +87,24 @@ namespace ZR.Admin.WebApi.Controllers.mes.qc.IQC [HttpGet("getWorkOrderBoardData")] public IActionResult GetWorkOrderBoardData(string workOrderId) { - if (string.IsNullOrEmpty(workOrderId)) + try { - return ToResponse(new ApiResult(500, "工单号传入异常！", "工单号传入异常！")); + if (string.IsNullOrEmpty(workOrderId)) + { + return ToResponse(new ApiResult(500, "工单号传入异常！", "工单号传入异常！")); + } + var result = _commonFQCService.GetWorkOrderBoardData(workOrderId); + if (result == null) + { + return ToResponse(new ApiResult(500, "获取看板数据异常-01:返回值为空", result)); + } + return ToResponse(new ApiResult(200, "ok", result)); } - var result = _commonFQCService.GetWorkOrderBoardData(workOrderId); - if (result == null) + catch (Exception ex) { - return ToResponse(new ApiResult(500, "获取看板数据异常-01:返回值为空", result)); + return ToResponse(new ApiResult(500, "获取看板数据异常-02" + ex.Message, ex.Message)); } - return ToResponse(new ApiResult(200, "ok", result)); + } /// /// 获取质量检测工单，生产线数据列表 diff --git a/ZR.Service/mes/qc/CommonFQCService.cs b/ZR.Service/mes/qc/CommonFQCService.cs index 243d6636..3de87ef6 100644 --- a/ZR.Service/mes/qc/CommonFQCService.cs +++ b/ZR.Service/mes/qc/CommonFQCService.cs @@ -285,7 +285,7 @@ namespace ZR.Service.mes.qc .First(); if (proWorkOrder == null) { - return null; + throw new Exception("未在生产工单中找到该工单！"); } // QcCommonFqcBoardDto boardData = new QcCommonFqcBoardDto(); @@ -353,7 +353,7 @@ namespace ZR.Service.mes.qc } catch (Exception ex) { - return null; + throw new Exception(ex.Message); } }