1.修改直通率周汇总，增加排序

AMESCoreStudio.Web/Controllers/QRSController.cs

@@ -9237,9 +9237,12 @@ namespace AMESCoreStudio.Web.Controllers
             //rateDataList = rateDataList + @"<tr><td>" + DateTime.Now.Year.ToString() + "-單板" + "</td>";
             string yCode = DateTime.Now.Year.ToString();
             if (dateStart != null)
+            {
+                if (dateStart != "")
                 {
                     yCode = dateStart.Substring(0, 4);
                 }
+            }
 
             #region 單板
 

AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs

@@ -437,6 +437,8 @@ FROM JHAMES.WIP_STATION";
                 FirstCnt = q.Where(j => j.Year == x.Key.Year && j.WeekOfYear == x.Key.WeekOfYear && j.RuleStatus == x.Key.RuleStatus).Sum(k => k.FirstCnt)
             });
 
+            g = g.OrderBy(p => p.WeekCode);
+
             result.DataTotal = g.ToList().Count;
 
             result.Data = await g.ToListAsync();
@@ -620,6 +622,8 @@ FROM JHAMES.WIP_STATION";
                 FirstCnt = q.Where(j => j.Year == x.Key.Year && j.WeekOfYear == x.Key.WeekOfYear && j.RuleStatus == x.Key.RuleStatus).Sum(k => k.FirstCnt)
             });
 
+            g = g.OrderBy(p => p.WeekCode);
+
             result.DataTotal = g.ToList().Count;
 
             result.Data = await g.ToListAsync();
@@ -802,6 +806,8 @@ FROM JHAMES.WIP_STATION";
                 FirstCnt = q.Where(j => j.Year == x.Key.Year && j.WeekOfYear == x.Key.WeekOfYear && j.RuleStatus == x.Key.RuleStatus).Sum(k => k.FirstCnt)
             });
 
+            g = g.OrderBy(p => p.WeekCode);
+
             result.DataTotal = g.ToList().Count;
 
             result.Data = await g.ToListAsync();