1.修改流程站別維護BAS010,排序站別,先M後S

AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs

@@ -78,11 +78,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
             }
             if (page > 0)
             {
-                q = q.OrderBy(p => p.Sequence).Skip((page - 1) * limit).Take(limit);
+                q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType).Skip((page - 1) * limit).Take(limit);
             }
             else
             {
-                q = q.OrderBy(p => p.Sequence);
+                q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType);
             }
 
             try
@@ -138,11 +138,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
 
                     if (page > 0)
                     {
-                        q = q.OrderBy(p => p.Sequence).Skip((page - 1) * limit).Take(limit);
+                        q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType).Skip((page - 1) * limit).Take(limit);
                     }
                     else
                     {
-                        q = q.OrderBy(p => p.Sequence);
+                        q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType);
                     }
                 }
                 else
@@ -164,11 +164,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
 
                     if (page > 0)
                     {
-                        q = q.OrderBy(p => p.Sequence).Skip((page - 1) * limit).Take(limit);
+                        q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType).Skip((page - 1) * limit).Take(limit);
                     }
                     else
                     {
-                        q = q.OrderBy(p => p.Sequence);
+                        q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType);
                     }
                 }
             }
@@ -180,11 +180,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
                 }
                 if (page > 0)
                 {
-                    q = q.OrderBy(p => p.Sequence).Skip((page - 1) * limit).Take(limit);
+                    q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType).Skip((page - 1) * limit).Take(limit);
                 }
                 else
                 {
-                    q = q.OrderBy(p => p.Sequence);
+                    q = q.OrderBy(p => p.Sequence).ThenBy(p => p.StationType);
                 }
             }