diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 879f109f..dc6b03c2 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -713,6 +713,28 @@ namespace AMESCoreStudio.Web.Controllers
             ViewBag.GetSolderPasteList = SolderPaste;
         }
 
+
+        /// <summary>
+        /// 工單資訊 系統工程資訊 Type
+        /// </summary>
+        /// <param name="SelectedValue"></param>
+        private void GetWipSystemTypeSelect(string SelectedValue = null)
+        {
+            List<string> values = new List<string>();
+            if (SelectedValue != null)
+            {
+                values = SelectedValue.Split(',').ToList();
+            }
+            var q = Enum.GetValues(typeof(Enums.EnumWipSystemType)).Cast<Enums.EnumWipSystemType>()
+                       .Select(s => new SelectListItem
+                       {
+                           Text = Enums.GetDisplayName(s).ToString(),
+                           Value = Convert.ToInt32(Enum.Parse(typeof(Enums.EnumWipSystemType), s.ToString())).ToString()
+                       }).ToList();
+
+            ViewBag.GetWipSystemTypeSelect = q;
+        }
+
         /// <summary>
         /// PCS List1 共用 BIOS/Checksum
         /// </summary>
@@ -1302,6 +1324,7 @@ namespace AMESCoreStudio.Web.Controllers
             GetPCBWorkingType();
             GetSolderPaste();
             GetWipType();
+            GetWipSystemTypeSelect();
             GetCustomerType();
             GetPCSList1();
             GetPCSOPList();
@@ -1331,6 +1354,7 @@ namespace AMESCoreStudio.Web.Controllers
             GetPCBWorkingType();
             GetSolderPaste();
             GetWipType();
+            GetWipSystemTypeSelect();
             GetCustomerType();
             GetPCSList1();
             GetPCSOPList();
@@ -1340,6 +1364,8 @@ namespace AMESCoreStudio.Web.Controllers
             GetCheckboxWipAttr();
             #endregion
 
+            return View();
+
             model.ruleStations = await _pcsApi.GetRuleStationByWipNo(model.wipInfo.WipNO);
             model.wipBarcodes = await _pcsApi.GetWipBarcode(model.wipInfo.WipNO);
             var q1 = await _pcsApi.GetMaterialSopQuery(itemNo: model.wipAtt.ItemNO);
diff --git a/AMESCoreStudio.Web/Enums/EnumPCS.cs b/AMESCoreStudio.Web/Enums/EnumPCS.cs
index adad0d6c..36aa0b37 100644
--- a/AMESCoreStudio.Web/Enums/EnumPCS.cs
+++ b/AMESCoreStudio.Web/Enums/EnumPCS.cs
@@ -97,7 +97,7 @@ namespace AMESCoreStudio.Web
             /// 無
             /// </summary>
             [Display(Name = "無")]
-            N 
+            N
         }
 
         /// <summary>
@@ -118,6 +118,61 @@ namespace AMESCoreStudio.Web
             B,
         }
 
+        /// <summary>
+        /// 工單資訊 系統工程資訊 Power mode
+        /// </summary>
+        public enum EnumWipSystemPMType
+        {
+            /// <summary>
+            /// H/W ATX
+            /// </summary>
+            [Display(Name = "H/W ATX")]
+            A = 1,
+
+            /// <summary>
+            /// H/W ATX，S/W AT
+            /// </summary>
+            [Display(Name = "H/W ATX，S/W AT")]
+            B = 2,
+
+            /// <summary>
+            /// H/W AT
+            /// </summary>
+            [Display(Name = "H/W AT")]
+            C = 3,
+
+        }
+
+        /// <summary>
+        /// 工單資訊 系統工程資訊 Type
+        /// </summary>
+        public enum EnumWipSystemType
+        {
+            /// <summary>
+            /// N/A
+            /// </summary>
+            [Display(Name = "N/A")]
+            A = 1,
+
+            /// <summary>
+            /// Check
+            /// </summary>
+            [Display(Name = "Check")]
+            B = 2,
+
+            /// <summary>
+            /// Program
+            /// </summary>
+            [Display(Name = "Program")]
+            C = 3,
+
+            /// <summary>
+            /// 備註說明
+            /// </summary>
+            [Display(Name = "備註說明")]
+            D = 4,
+        }
+
         /// <summary>
         /// Get Enum Display
         /// </summary>
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index c1ecde94..354bb031 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -670,16 +670,19 @@
                                 <div class="layui-input-inline">
                                     <input class="layui-input" asp-for="wipSystem.Ram" autocomplete="off" />
                                 </div>
-                                <label class="layui-form-label" asp-for="wipSystem.OsVer"></label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.OsVer" autocomplete="off" />
-                                </div>
+
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
                                 <label class="layui-form-label">EC</label>
+                                <div class="layui-input-inline">
+                                    <select asp-for="wipSystem.ECType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
+                                </div>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" asp-for="wipSystem.Ec" autocomplete="off" />
+                                </div>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" asp-for="wipSystem.Ec" autocomplete="off" />
                                 </div>
@@ -713,6 +716,14 @@
                             </div>
                         </div>
 
+                        <div class="layui-form-item">
+                            <div class="layui-inline">
+                                <label class="layui-form-label" asp-for="wipSystem.OsVer"></label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" asp-for="wipSystem.OsVer" autocomplete="off" />
+                                </div>
+                            </div>
+                        </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs b/AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs
index faba5ca0..eaf2dc5b 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs
@@ -80,6 +80,23 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Display(Name = "燒機備註")]
         public string BiMemo { get; set; }
 
+        /// <summary>
+        /// BIOS_Type
+        /// </summary>
+        [DataMember]
+        [Display(Name = "BIOS")]
+        [Column("BIOS_TYPE")]
+        public int BiosType { get; set; } = 1;
+
+        /// <summary>
+        /// BIOS
+        /// </summary>
+        [DataMember]
+        [Display(Name = "BIOS")]
+        [Column("BIOS")]
+        [Required(ErrorMessage = "{0},不能空白")]
+        public string Bios { get; set; }
+
         /// <summary>
         /// BIOS版本
         /// </summary>
@@ -129,6 +146,13 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Display(Name = "是否為精包裝")]
         public string FinePackage { get; set; }
 
+        /// <summary>
+        /// EC_Type
+        /// </summary>
+        [DataMember]
+        [Column("EC_TYPE")]
+        public int ECType { get; set; } = 1;
+
         /// <summary>
         /// EC
         /// </summary>
@@ -138,6 +162,13 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Display(Name = "EC")]
         public string Ec { get; set; }
 
+        /// <summary>
+        /// FW_Type
+        /// </summary>
+        [DataMember]
+        [Column("FW_TYPE")]
+        public int FWType { get; set; } = 1;
+
         /// <summary>
         /// Firewall
         /// </summary>
@@ -147,6 +178,13 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Display(Name = "FW")]
         public string Fw { get; set; }
 
+        /// <summary>
+        /// EC_Type
+        /// </summary>
+        [DataMember]
+        [Column("FW1_TYPE")]
+        public int FW1Type { get; set; } = 1;
+
         /// <summary>
         /// Firewall 1
         /// </summary>
@@ -156,6 +194,13 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Display(Name = "FW1")]
         public string Fw1 { get; set; }
 
+        /// <summary>
+        /// FW2_Type
+        /// </summary>
+        [DataMember]
+        [Column("FW2_TYPE")]
+        public int FW2Type { get; set; } = 1;
+
         /// <summary>
         /// Firewall 2
         /// </summary>
@@ -165,6 +210,13 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Display(Name = "FW2")]
         public string Fw2 { get; set; }
 
+        /// <summary>
+        /// OS_Type
+        /// </summary>
+        [DataMember]
+        [Column("OS_TYPE")]
+        public int OsType { get; set; } = 1;
+
         /// <summary>
         /// OS版本
         /// </summary>