From d59b540dd78d49ddf1f2e1c6dfb7b19a7d3e3d7c Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期日, 19 一月 2025 11:19:24 +0800
Subject: [PATCH] 优化代码结构和错误处理

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index 54cb5c1..5499743 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -168,7 +168,6 @@
                         if (content.Status)
                         {
                             var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
-                            task.Remark = result.Success ? null : "NG";
 
                             if (!result.Success && result.MessageCode == "E10001")
                             {
@@ -178,9 +177,17 @@
                         else
                         {
                             task.Remark = "NG";
+                            ConsoleHelper.WriteErrorLine("MOM閫氭姤鐐硅姱NG");
+                            return content.Error("MOM閫氭姤鐐硅姱NG");
                         }
                     }
                 }
+            }
+
+            if (task.Remark == "NG")
+            {
+                ConsoleHelper.WriteErrorLine("MOM閫氭姤鐐硅姱NG");
+                return content.Error("MOM閫氭姤鐐硅姱NG");
             }
 
             // 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
@@ -738,7 +745,7 @@
                 return content.Error(result.MOMMessage);
 
             // 鑾峰彇寮傚父鐢佃姱
-            List<SerialNoDto>? serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
+            List<SerialNoDto>? serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
             if (serialNosError.Count > 0)
             {
                 // TODO 鍒涘缓浠诲姟閫佽嚦NG鎺掑嚭鍙�
@@ -1089,7 +1096,7 @@
                     throw new Exception("鏈壘鍒扮┖鎵樼洏鍏ュ簱绔欏彴鍜屽叆搴撶珯鍙伴厤缃�");
             }
             List<string> strings = stationManagers.Roadway.Split(',').ToList();
-            Console.WriteLine(strings.ToJsonString() + "b-----------------------");
+            //Console.WriteLine(strings.ToJsonString() + "b-----------------------");
 
             return await CreateNewTask(input, strings, 1);
         }
@@ -1265,7 +1272,7 @@
     /// <summary>
     /// 鏌ヨ绌虹洏搴撳瓨淇℃伅
     /// </summary>
-    private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode,string position)
+    private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, string position)
     {
         var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
 

--
Gitblit v1.9.3