Merge branch 'master' of http://49.235.130.76/XXF_1122/DaisyNPILine

TeamAAS-VM/Core/Management.cs

@@ -2465,7 +2465,7 @@ namespace TeamAAS_VP.Core
                                                             WO = wo[i],
                                                             MFG_LOT = stationConfig.DataInfo.MFG_LOT,
                                                             MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
-                                                            PROCESS_OUTCOME = torqueRes ? "PASS" : "FAIL",
+                                                            PROCESS_OUTCOME = torqueRes ? "Pass" : "Fail",
                                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                             CTQ_UNIT_OF_MEASURE = "kgf.cm",
                                                             ERROR_MESSAGE = torqueRes ? "" : "Torque_Spec OOS"
@@ -2486,7 +2486,7 @@ namespace TeamAAS_VP.Core
                                                             WO = wo[i],
                                                             MFG_LOT = stationConfig.DataInfo.MFG_LOT,
                                                             MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
-                                                            PROCESS_OUTCOME = turnRes ? "PASS" : "FAIL",
+                                                            PROCESS_OUTCOME = turnRes ? "Pass" : "Fail",
                                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                             CTQ_UNIT_OF_MEASURE = "圈",
                                                             ERROR_MESSAGE = turnRes ? "" : "Turn_Spec OOS"
@@ -2507,7 +2507,7 @@ namespace TeamAAS_VP.Core
                                                             WO = wo[i],
                                                             MFG_LOT = stationConfig.DataInfo.MFG_LOT,
                                                             MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
-                                                            PROCESS_OUTCOME = pressureRes ? "PASS" : "FAIL",
+                                                            PROCESS_OUTCOME = pressureRes ? "Pass" : "Fail",
                                                             PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
                                                             CTQ_UNIT_OF_MEASURE = "N",
                                                             ERROR_MESSAGE = pressureRes ? "" : "Pressure_Spec OOS"

TeamAAS-VM/Services/MesService.cs

@@ -475,8 +475,8 @@ namespace TeamAAS_VP.Services
                 }
             }
 
-            //string res = isSuccess ? "PASS" : "FAIL";
-            string res = "PASS";
+            //string res = isSuccess ? "Pass" : "Fail";
+            string res = "Pass";
             string url = "";
             if (device.F == "PTL")
             {
@@ -568,8 +568,8 @@ namespace TeamAAS_VP.Services
                 }
             }
 
-            //string res = isSuccess ? "PASS" : "FAIL";
-            string res = "PASS";
+            //string res = isSuccess ? "Pass" : "Fail";
+            string res = "Pass";
             string url = "";
             if (device.F == "PTL")
             {