From efff7c35ec917aec46481d4ab412b36c56381a51 Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期六, 04 一月 2025 10:03:09 +0800
Subject: [PATCH] 合并

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 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 e103260..a6e2d45 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
@@ -169,12 +169,19 @@
                         var agingOutputDto = MapToAgingOutputDto(stock);
                         content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
 
-                        var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
-                        task.Remark = result.Success ? null : "NG";
-
-                        if (!result.Success && result.MessageCode == "E10001")
+                        if (content.Status)
                         {
-                            await HandleOutBoundError(stock, task);
+                            var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
+                            task.Remark = result.Success ? null : "NG";
+
+                            if (!result.Success && result.MessageCode == "E10001")
+                            {
+                                await HandleOutBoundError(stock, task);
+                            }
+                        }
+                        else
+                        {
+                            task.Remark = "NG";
                         }
                     }
                 }
@@ -560,7 +567,7 @@
             Remark = boxing.BoxingInfoDetails.Count().ToString(),
         };
 
-        if (boxing.ProcessCode != "OCVB" || !task.Roadway.Contains("FR"))
+        if (boxing.ProcessCode != "OCVB" && !task.Roadway.Contains("FR"))
         {
             // 澶勭悊璇锋眰鍙傛暟
             AgingInputDto agingInputDto = new AgingInputDto()
@@ -959,11 +966,17 @@
             // 鍒涘缓骞惰幏鍙栨暣鐩樼數鑺姸鎬�
             TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, input.PalletCode);
             content = await GetTrayCellStatusAsync(trayCells);
-            if (!content.Status) return content;
+            if (!content.Status)
+            {
+                ConsoleHelper.WriteErrorLine($"鑾峰彇鐢佃姱鐘舵�佸け璐�:{content.Message}");
+                return content;
+            }
 
             var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+
             if (!result.Success)
             {
+                ConsoleHelper.WriteErrorLine($"鑾峰彇鐢佃姱鐘舵�佸け璐�:{result.MOMMessage}");
                 if (result.SerialNos.Count <= 0)
                 {
                     // 绌烘墭鐩樺叆搴撻�昏緫
@@ -982,7 +995,7 @@
             }
 
             // 澶勭悊寮傚父鐢佃姱鎯呭喌
-            var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
+            var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
             if (serialNosError.Count > 0)
             {
                 return await HandleErrorCells(input, area, serialNosError);

--
Gitblit v1.9.3