修改运踪查询

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>

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))
                             {