From 4514dc103d2b98da674761e0aa51a9480a150da2 Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Thu, 16 May 2024 14:39:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=B8=AA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/QueryTraceAfterPortResultDto.cs                   | 5 +++++
 .../EmbedProjectGoodsStatus/EmbedTraceProductService.cs    | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Myshipping.Application/Service/EmbedProjectGoodsStatus/Dtos/QueryTraceAfterPortResultDto.cs b/Myshipping.Application/Service/EmbedProjectGoodsStatus/Dtos/QueryTraceAfterPortResultDto.cs
index 92f89f00..8cb025cb 100644
--- a/Myshipping.Application/Service/EmbedProjectGoodsStatus/Dtos/QueryTraceAfterPortResultDto.cs
+++ b/Myshipping.Application/Service/EmbedProjectGoodsStatus/Dtos/QueryTraceAfterPortResultDto.cs
@@ -344,6 +344,11 @@ namespace Myshipping.Application
         /// </summary>
         public string sizeName { get; set; }
 
+        /// <summary>
+        /// 当前节点代码中文
+        /// </summary>
+        public string currentNodeCnName { get; set; }
+
         /// <summary>
         /// 集装箱状态信息
         /// </summary>
diff --git a/Myshipping.Application/Service/EmbedProjectGoodsStatus/EmbedTraceProductService.cs b/Myshipping.Application/Service/EmbedProjectGoodsStatus/EmbedTraceProductService.cs
index 6a2a1be2..ea95f233 100644
--- a/Myshipping.Application/Service/EmbedProjectGoodsStatus/EmbedTraceProductService.cs
+++ b/Myshipping.Application/Service/EmbedProjectGoodsStatus/EmbedTraceProductService.cs
@@ -206,7 +206,7 @@ namespace Myshipping.Application
                         }
                         else
                         {
-                            currStatus.isComplete = true;
+                            currStatus.isComplete = false;
                             currStatus.hasStatusCtnNum = currArg.Count(a => a.isEst.Equals("N", StringComparison.OrdinalIgnoreCase));
                             currStatus.noStatusCtnNum = currArg.Count(a => !a.isEst.Equals("N", StringComparison.OrdinalIgnoreCase));
                         }
@@ -260,6 +260,11 @@ namespace Myshipping.Application
 
                     result.resultData.containerInfoList.ForEach(b =>
                     {
+                        if(statusEnumDict.Any(k=> !string.IsNullOrWhiteSpace(b.currentNodeCd) && k.Key.Equals(b.currentNodeCd, StringComparison.OrdinalIgnoreCase)))
+                        {
+                            b.currentNodeCnName = !string.IsNullOrWhiteSpace(statusEnumDict[b.currentNodeCd].Item2) ? statusEnumDict[b.currentNodeCd].Item2 : statusEnumDict[b.currentNodeCd].Item1;
+                        }
+                        
                         b.containerStatusInfoList.ForEach(c => {
                             if (!string.IsNullOrWhiteSpace(b.currentNodeCd) && b.currentNodeCd.Equals(c.statusCd, StringComparison.OrdinalIgnoreCase))
                             {