From 956fccaf6b55fb44954b5a9cd553d19615f6cd7a Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Mon, 26 Aug 2024 17:30:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QcMgr/Tnb.QcMgr/QcCheckPlanService.cs | 4 ++--
 QcMgr/Tnb.QcMgr/QcCheckTaskService.cs | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
index 0e267cb0..badc4ac4 100644
--- a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
@@ -439,12 +439,12 @@ namespace Tnb.QcMgr
 
             if (list.IsEmpty())
             {
-                throw Oops.Bah("未找到质检方案");
+                throw Oops.Bah($"{entity.triggerevent.ToString()}未找到质检方案");
             }
 
             if (list.Count > 1)
             {
-                throw Oops.Bah("找到多个质检方案");
+                throw Oops.Bah($"{entity.triggerevent.ToString()}找到多个质检方案");
             }
             
             // List<string> removes = new();
diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
index 0ba02f11..32ee9afe 100644
--- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
@@ -156,7 +156,7 @@ namespace Tnb.QcMgr
                 checknum = !string.IsNullOrEmpty(QcCheckExecH.checknum) ? int.Parse(QcCheckExecH.checknum) : 0,
                 worker_name = userEntity?.RealName ?? "",
                 bill_code = QcCheckExecH.bill_code,
-                carry_code = prdReport?.material_box_code,
+                carry_code = prdReport!=null ? prdReport.material_box_code : "",
             };
             if (!string.IsNullOrEmpty(CheckTaskOut.workid))
             {
@@ -195,7 +195,8 @@ namespace Tnb.QcMgr
                     Item.setData.errorcause = new List<Error>();
                     foreach (string str in strs)
                     {
-                        Item.setData.errorcause.Add(new Error { id = str, name = QcErrorCauses.Where(p => p.id == str).First().name! });
+                        if (string.IsNullOrEmpty(str) || str == "null") continue;
+                        Item.setData.errorcause.Add(new Error { id = str, name = QcErrorCauses.Where(p => p.id == str).First()?.name! });
                     }
                 }
                 if (!string.IsNullOrEmpty(QcCheckExecD.errorlevel))
@@ -204,7 +205,8 @@ namespace Tnb.QcMgr
                     Item.setData.errorlevel = new List<Error>();
                     foreach (string str in strs)
                     {
-                        Item.setData.errorlevel.Add(new Error { id = str, name = QcErrorLevels.Where(p => p.id == str).First().name! });
+                        if (string.IsNullOrEmpty(str) || str == "null") continue;
+                        Item.setData.errorlevel.Add(new Error { id = str, name = QcErrorLevels.Where(p => p.id == str).First()?.name! });
                     }
                 }
                 Item.setData.remark = QcCheckExecD.remark!;