修改服务状态获取

Myshipping.Application/Service/TrackingSystem/Dtos/ServiceProjectWithStatusDto.cs

@@ -173,5 +173,10 @@ namespace Myshipping.Application
         /// 服务流程排序值
         /// </summary>
         public int WFSortNo { get; set; }
+
+        /// <summary>
+        /// 计算排序值
+        /// </summary>
+        public decimal CalcSortNo { get; set; }
     }
 }

Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowManageService.cs

@@ -1553,7 +1553,8 @@ namespace Myshipping.Application
                                         IsYield = false,
                                         StatusSKUCode = b.StatusSKUCode,
                                         ActRemark = b.ActRemark,
-                                        WFSortNo = l.SortNo
+                                        WFSortNo = l.SortNo,
+                                        CalcSortNo = (decimal)b.ActSortNo,
                                     });
 
                                     if(b.SubStatusList != null && b.SubStatusList.Count > 0)
@@ -1566,14 +1567,16 @@ namespace Myshipping.Application
                                             IsYield = false,
                                             StatusSKUCode = b.StatusSKUCode,
                                             ActRemark = b.ActRemark,
-                                            WFSortNo = l.SortNo
+                                            WFSortNo = l.SortNo,
+                                            CalcSortNo = (decimal)b.ActSortNo + (c.ActSortNo * 0.001m)
                                         }).ToList());
                                     }
                                 });
                             }
                             else
                             {
-                                rltList = runInfo.ActivitiesList.Select(b => new ServiceProjectStatusDto
+                                runInfo.ActivitiesList.ForEach(b => {
+                                    rltList.Add(new ServiceProjectStatusDto
                                     {
                                         ActPKId = b.ActId,
                                         ActSortNo = b.ExecSortNo,
@@ -1583,8 +1586,27 @@ namespace Myshipping.Application
                                         ActVal = b.ActVal,
                                         StatusSKUCode = b.StatusSKUCode,
                                         ActRemark = b.ActRemark,
-                                    WFSortNo = l.SortNo
+                                        WFSortNo = l.SortNo,
-                                }).ToList();
+                                        CalcSortNo = (decimal)b.ExecSortNo
+                                    });
+
+                                    if (b.SubList != null && b.SubList.Count > 0)
+                                    {
+                                        rltList.AddRange(b.SubList.Select(c => new ServiceProjectStatusDto
+                                        {
+                                            ActPKId = c.ActId,
+                                            ActSortNo = c.ExecSortNo,
+                                            ShowName = c.ShowName,
+                                            IsYield = c.IsYield == 1 ? true : false,
+                                            ActDate = c.ActDate,
+                                            ActVal = c.ActVal,
+                                            StatusSKUCode = c.StatusSKUCode,
+                                            ActRemark = c.ActRemark,
+                                            WFSortNo = l.SortNo,
+                                            CalcSortNo = (decimal)b.ExecSortNo + (c.ExecSortNo * 0.001m)
+                                        }).ToList());
+                                    }
+                                });
                             }
                         }
                         
@@ -1607,7 +1629,7 @@ namespace Myshipping.Application
                         }
 
                         return b;
-                    }).OrderBy(b => b.WFSortNo).ThenBy(b=>b.ActSortNo).ToList();
+                    }).OrderBy(b => b.WFSortNo).ThenBy(b=>b.CalcSortNo).ToList();
 
 
                 result.succ = true;