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));
+            
         }
         /// <summary>
         /// 获取质量检测工单，生产线数据列表
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);
             }
         }