diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 7b9cdeb0..0654a907 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -7749,8 +7749,8 @@ namespace AMESCoreStudio.Web.Controllers
                                 else
                                 {
                                     //  result_FQC = await _pcsApi.PutFqcInhouseMaster_EVER(JsonConvert.SerializeObject(fqcInhouseMaster));
-                                    
-                                    await _pcsApi.PutFqcInhouseMasterForLocationNo_EVER(JsonConvert.SerializeObject(fqcInhouseMaster));
+
+                                    result_FQC = await _pcsApi.PutFqcInhouseMasterForLocationNo_EVER(JsonConvert.SerializeObject(fqcInhouseMaster));
                                 }
 
                                 if (!result_FQC.Success)
@@ -9118,7 +9118,7 @@ namespace AMESCoreStudio.Web.Controllers
 
                     #endregion
                 }
-                result.Data = result.Data.OrderBy(o => o.StartNo);
+                result.Data = result.Data.OrderBy(o => o.WipScheduleDate).ThenBy(o =>o.StartNo);
                 return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
             }
         }