diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index e02ac3db..88afd57f 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -6116,6 +6116,12 @@ namespace AMESCoreStudio.Web.Controllers
             var q = await _pcsApi.GetWipInfoByWipNO(model.WipNO);
             q = q.Where(w => w.UnitNO == model.UnitNO).ToList();
 
+            // 工單流程ID 取站別
+            var ruleStations = await GetRuleStationByFlowRuleID(model.FlowRuleID);
+            var StationNameSt = ""; // 作業站名稱代碼 提供不二過
+            if (model.Station == 0)
+                model.Station = ruleStations.FirstOrDefault().StationID;
+
             // 取作業站的生產製程
             var stationUnit = string.Empty;
             var station = await _basApi.GetStations(model.Station);
@@ -6150,9 +6156,7 @@ namespace AMESCoreStudio.Web.Controllers
                     return View("PCS021", model);
                 }
 
-                // 工單流程ID 取站別
-                var ruleStations = await GetRuleStationByFlowRuleID(model.FlowRuleID);
-                var StationNameSt = ""; // 作業站名稱代碼 提供不二過
+          
                 if (model.Station != 0)
                 {
                     if (ruleStations.Where(w => w.StationID == model.Station).Any())
diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
index ef53a76d..232417ce 100644
--- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
@@ -281,7 +281,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                     #endregion
 
                                     #region 判斷MAC區間
-                                    if (q_Kp.KpNo.ToUpper().Contains("MAC"))
+                                    if (q_Kp.KpNo.ToUpper() == "MAC")
                                     {
 
                                         var wipMAC = await wipMACController.GetWipMAC(barCodeCheckDto.wipNo);
@@ -1929,7 +1929,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         #endregion
 
                         #region 判斷MAC區間
-                        if (wipKpsItem.KpNo.ToUpper().Contains("MAC"))
+                        if (wipKpsItem.KpNo.ToUpper() == "MAC")
                         {
                             WipMACController wipMACController = new WipMACController(_context);
                             var wipMAC = await wipMACController.GetWipMAC(barcodeItemKPDto.WipNo);
diff --git a/AMESCoreStudio.WebApi/Models/AMES/FqcResultMaster.cs b/AMESCoreStudio.WebApi/Models/AMES/FqcResultMaster.cs
index 1d9ffbec..62271d60 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/FqcResultMaster.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/FqcResultMaster.cs
@@ -228,7 +228,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Display(Name = "OS")]
         [Column("OS")]
-        [StringLength(20)]
+        [StringLength(50)]
         public string OS { get; set; }
 
         /// <summary>
@@ -237,7 +237,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Display(Name = "CPU test")]
         [Column("CPU")]
-        [StringLength(20)]
+        [StringLength(50)]
         public string CPU { get; set; }
 
         /// <summary>
@@ -246,7 +246,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Display(Name = "RAM test")]
         [Column("RAM")]
-        [StringLength(20)]
+        [StringLength(50)]
         public string RAM { get; set; }
 
         /// <summary>
@@ -255,7 +255,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Display(Name = "BIOS")]
         [Column("BIOS")]
-        [StringLength(20)]
+        [StringLength(50)]
         public string BIOS { get; set; }
 
         /// <summary>
@@ -264,7 +264,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Display(Name = "檢驗儀器編號")]
         [Column("OUTFIT_NO")]
-        [StringLength(20)]
+        [StringLength(50)]
         public string OutfitNo { get; set; }
 
         /// <summary>