From 1c637ea862816ae6fa53945fa0327b95c79aa18b Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 22 八月 2025 16:20:27 +0800
Subject: [PATCH] 增强 WMS IP 地址处理逻辑的健壮性在 `TaskService.cs` 文件中,添加了对 `result` 是否为 `null` 的检查,以确保在反序列化之前 `result` 是有效的。同时,调整了对 `content.Data` 的检查逻辑,确保在 `content.Data` 不为空的情况下,才会进一步检查其值是否为 "NG"。如果是 "NG",则设置 `task.Remark` 为 "NG"。这些更改提高了代码的健壮性,避免了潜在的空引用异常。

---
 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user |    2 +-
 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs                               |   16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 1ca03de..d285a10 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>E:\GET\BaiBuSanLouNew\CodeManagement\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Release\net6.0\publish\</_PublishTargetUrl>
-    <History>True|2025-07-22T06:47:26.2951049Z||;True|2025-07-22T14:45:26.2487877+08:00||;True|2025-07-17T14:23:12.9364562+08:00||;True|2025-07-17T14:22:09.8047880+08:00||;True|2025-07-16T16:00:37.8280989+08:00||;True|2025-07-15T10:52:26.8635009+08:00||;True|2025-07-10T15:32:24.9502583+08:00||;True|2025-07-10T15:27:10.5295296+08:00||;True|2025-06-25T15:55:01.4687124+08:00||;True|2025-06-13T14:06:02.3387675+08:00||;True|2025-06-13T12:12:05.8571668+08:00||;True|2025-06-13T11:07:21.0883921+08:00||;True|2025-06-13T10:58:41.4512589+08:00||;True|2025-06-12T16:02:45.3477017+08:00||;True|2025-06-06T09:30:09.4409029+08:00||;True|2025-06-05T14:22:11.1558952+08:00||;True|2025-06-05T14:21:15.0801810+08:00||;</History>
+    <History>True|2025-08-22T08:17:45.4954874Z||;True|2025-07-22T14:47:26.2951049+08:00||;True|2025-07-22T14:45:26.2487877+08:00||;True|2025-07-17T14:23:12.9364562+08:00||;True|2025-07-17T14:22:09.8047880+08:00||;True|2025-07-16T16:00:37.8280989+08:00||;True|2025-07-15T10:52:26.8635009+08:00||;True|2025-07-10T15:32:24.9502583+08:00||;True|2025-07-10T15:27:10.5295296+08:00||;True|2025-06-25T15:55:01.4687124+08:00||;True|2025-06-13T14:06:02.3387675+08:00||;True|2025-06-13T12:12:05.8571668+08:00||;True|2025-06-13T11:07:21.0883921+08:00||;True|2025-06-13T10:58:41.4512589+08:00||;True|2025-06-12T16:02:45.3477017+08:00||;True|2025-06-06T09:30:09.4409029+08:00||;True|2025-06-05T14:22:11.1558952+08:00||;True|2025-06-05T14:21:15.0801810+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
index 1f80821..f7cb0c7 100644
--- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
+++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -763,14 +763,18 @@
                 var wmsIpAddress = wmsBase + completeTask;
 
                 var result = HttpHelper.GetAsync(wmsIpAddress, keys).Result;
-                content = JsonConvert.DeserializeObject<WebResponseContent>(result);
-                if (!content.Data.IsNullOrEmpty())
+
+                if (result != null)
                 {
-                    if (content.Data.ToString() == "NG")
+                    content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+                    if (!content.Data.IsNullOrEmpty())
                     {
-                        task.Remark = "NG";
-                        //BaseDal.UpdateData(task);
-                        //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴愶紝MOM杩斿洖NG");
+                        if (content.Data.ToString() == "NG")
+                        {
+                            task.Remark = "NG";
+                            //BaseDal.UpdateData(task);
+                            //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴愶紝MOM杩斿洖NG");
+                        }
                     }
                 }
                 task.ExceptionMessage += "   " + content.Message;

--
Gitblit v1.9.3