diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index b1356c9d..163afeee 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -18,6 +18,8 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using AMESCoreStudio.WebApi.Enum;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Configuration;
 
 namespace AMESCoreStudio.Web.Controllers
 {
@@ -35,9 +37,12 @@ namespace AMESCoreStudio.Web.Controllers
         public readonly IKCS _kcsApi;
         public readonly IFileServerProvider _fileServerProvider;
         private readonly IWebHostEnvironment _env;
+        private readonly IStringLocalizer _sharedLocalizer;
+        private readonly IConfiguration _configuration;
 
         public PCSController(ILogger<PCSController> logger, ILogger<LoginController> log, ISYS sysApi, IPCS pcsApi, IBAS basApi, IPPS ppsApi, IFQC fqcApi
-            , IFileServerProvider fileServerProvider, IWebHostEnvironment env, IKCS kcsApi)
+            , IFileServerProvider fileServerProvider, IWebHostEnvironment env, IKCS kcsApi, IStringLocalizer<SharedResource> sharedLocalizer
+            , IConfiguration configuration)
         {
             _logger = logger;
             _log = log;
@@ -49,6 +54,9 @@ namespace AMESCoreStudio.Web.Controllers
             _kcsApi = kcsApi;
             _fileServerProvider = fileServerProvider;
             _env = env;
+            _sharedLocalizer = sharedLocalizer;
+            _configuration = configuration;
+
         }
 
         #region Funcion BLL
@@ -77,17 +85,24 @@ namespace AMESCoreStudio.Web.Controllers
 
             // 序號編碼sheet
 
-
-            // 系統
-            if (model.wipInfo.UnitNO == "B" || model.wipInfo.UnitNO == "P" || model.wipInfo.UnitNO == "T")
+            // 安勤統一執行WIP_SYSTEM
+            if (ViewBag.WipSpecial == "Y")
             {
-
                 Msg += CheckWipInfoInsert_WipSystem(model.wipSystem);
             }
-            // 板卡
             else
             {
-                Msg += CheckWipInfoInsert_WipBoard(model.wipBoard);
+                // 系統
+                if (model.wipInfo.UnitNO == "B" || model.wipInfo.UnitNO == "P" || model.wipInfo.UnitNO == "T")
+                {
+
+                    Msg += CheckWipInfoInsert_WipSystem(model.wipSystem);
+                }
+                // 板卡
+                else
+                {
+                    Msg += CheckWipInfoInsert_WipBoard(model.wipBoard);
+                }
             }
 
             // 內部條碼
@@ -732,6 +747,48 @@ namespace AMESCoreStudio.Web.Controllers
             ViewBag.GetWipSystemDMITypeSelect = q;
         }
 
+        /// <summary>
+        /// 工單資訊 燒機溫度
+        /// </summary>
+        /// <param name="SelectedValue"></param>
+        private void GetWipBITemperatuerSelect(string SelectedValue = null)
+        {
+            List<string> values = new List<string>();
+            if (SelectedValue != null)
+            {
+                values = SelectedValue.Split(',').ToList();
+            }
+            var q = Enum.GetValues(typeof(EnumPCS.EnumWipBITemperatuer)).Cast<EnumPCS.EnumWipBITemperatuer>()
+                       .Select(s => new SelectListItem
+                       {
+                           Text = EnumPCS.GetDisplayName(s).ToString(),
+                           Value = s.ToString()
+                       }).ToList();
+
+            ViewBag.GetWipBITemperatuerSelect = q;
+        }
+
+        /// <summary>
+        /// 工單資訊 燒機軟體
+        /// </summary>
+        /// <param name="SelectedValue"></param>
+        private void GetWipBI_OSSelect(string SelectedValue = null)
+        {
+            List<string> values = new List<string>();
+            if (SelectedValue != null)
+            {
+                values = SelectedValue.Split(',').ToList();
+            }
+            var q = Enum.GetValues(typeof(EnumPCS.EnumWipBI_OS)).Cast<EnumPCS.EnumWipBI_OS>()
+                       .Select(s => new SelectListItem
+                       {
+                           Text = EnumPCS.GetDisplayName(s).ToString(),
+                           Value = s.ToString()
+                       }).ToList();
+
+            ViewBag.GetWipBI_OSSelect = q;
+        }
+
         /// <summary>
         /// SOP_Type
         /// </summary>
@@ -1747,6 +1804,8 @@ namespace AMESCoreStudio.Web.Controllers
 
         public async Task<IActionResult> PCS001R(int id)
         {
+            // 針對安勤 工單基本資料統一打開工程資訊
+            ViewBag.WipSpecial = _configuration["WipSpecial"];
 
             WipDataViewModel model = new WipDataViewModel();
             var q = await _pcsApi.GetWipInfo(id);
@@ -1769,6 +1828,8 @@ namespace AMESCoreStudio.Web.Controllers
                         var UserInof = _sysApi.GetUserInfoByUserNo(model.wipBoard.Engineer).InvokeAsync().Result;
                         if (UserInof != null)
                             model.wipBoard.Engineer_Name = UserInof.UserName;
+
+                        
                     }
                 }
 
@@ -1781,6 +1842,22 @@ namespace AMESCoreStudio.Web.Controllers
                         if (UserInof != null)
                             model.wipSystem.Engineer_Name = UserInof.UserName;
                     }
+
+                    var Ec_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Ec).InvokeAsync().Result;
+                    var Fw_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw).InvokeAsync().Result;
+                    var Fw1_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw1).InvokeAsync().Result;
+                    var Fw2_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw2).InvokeAsync().Result;
+                    var Bios_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Bios).InvokeAsync().Result;
+                    var Os_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.OsVer).InvokeAsync().Result;
+                    var PowerMode_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.PowerMode).InvokeAsync().Result;
+
+                    model.wipSystem.Ec_Desc = Ec_Desc == null ? "" : Ec_Desc.MeterialDesc;
+                    model.wipSystem.Fw_Desc = Fw_Desc == null ? "" : Fw_Desc.MeterialDesc;
+                    model.wipSystem.Fw1_Desc = Fw1_Desc == null ? "" : Fw1_Desc.MeterialDesc;
+                    model.wipSystem.Fw2_Desc = Fw2_Desc == null ? "" : Fw2_Desc.MeterialDesc;
+                    model.wipSystem.Bios_Desc = Bios_Desc == null ? "" : Bios_Desc.MeterialDesc;
+                    model.wipSystem.OsVer_Desc = Os_Desc == null ? "" : Os_Desc.MeterialDesc;
+                    model.wipSystem.PowerMode_Desc = PowerMode_Desc == null ? "" : PowerMode_Desc.ProductionMemo;
                 }
 
                 model.wipMAC = await _pcsApi.GetWipMAC(model.wipInfo.WipNO);
@@ -1804,7 +1881,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                 model.wipInfoBlobs = await _pcsApi.GetWipInfoBlob(model.wipInfo.WipNO);
             }
-       
+
+            await WipDataSelectAll(model.wipAtt.WipNO, model.wipAtt.ItemNO, model.wipInfo.UnitNO);
+
             GetCheckboxApproveLogo(model.wipLabel != null ? model.wipLabel.ApproveLogo : null);
             GetCheckboxCompanyLogo(model.wipLabel != null ? model.wipLabel.CompanyLogo : null);
             GetCheckboxPrintMode(model.wipLabel != null ? model.wipLabel.PrintMode : null);
@@ -1818,6 +1897,9 @@ namespace AMESCoreStudio.Web.Controllers
 
         public async Task<IActionResult> PCS003(int id)
         {
+            // 針對安勤 工單基本資料統一打開工程資訊
+            ViewBag.WipSpecial = _configuration["WipSpecial"];
+
             WipDataViewModel model = new WipDataViewModel();
             var q = await _pcsApi.GetWipInfo(id);
             if (q.Count != 0)
@@ -1858,6 +1940,22 @@ namespace AMESCoreStudio.Web.Controllers
                 model.wipSystem = await _pcsApi.GetWipSystem(model.wipInfo.WipNO);
                 if (model.wipSystem != null)
                 {
+                    var Ec_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Ec).InvokeAsync().Result;
+                    var Fw_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw).InvokeAsync().Result;
+                    var Fw1_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw1).InvokeAsync().Result;
+                    var Fw2_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw2).InvokeAsync().Result;
+                    var Bios_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Bios).InvokeAsync().Result;
+                    var Os_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.OsVer).InvokeAsync().Result;
+                    var PowerMode_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.PowerMode).InvokeAsync().Result;
+
+                    model.wipSystem.Ec_Desc = Ec_Desc == null ? "" : Ec_Desc.MeterialDesc;
+                    model.wipSystem.Fw_Desc = Fw_Desc == null ? "" : Fw_Desc.MeterialDesc;
+                    model.wipSystem.Fw1_Desc = Fw1_Desc == null ? "" : Fw1_Desc.MeterialDesc;
+                    model.wipSystem.Fw2_Desc = Fw2_Desc == null ? "" : Fw2_Desc.MeterialDesc;
+                    model.wipSystem.Bios_Desc = Bios_Desc == null ? "" : Bios_Desc.MeterialDesc;
+                    model.wipSystem.OsVer_Desc = Os_Desc == null ? "" : Os_Desc.MeterialDesc;
+                    model.wipSystem.PowerMode_Desc = PowerMode_Desc == null ? "" : PowerMode_Desc.ProductionMemo;
+
                     if (!string.IsNullOrWhiteSpace(model.wipSystem.Engineer))
                     {
                         var UserInof = _sysApi.GetUserInfoByUserNo(model.wipSystem.Engineer).InvokeAsync().Result;
@@ -1897,16 +1995,24 @@ namespace AMESCoreStudio.Web.Controllers
             GetCheckboxSMDSolderMa(model.wipBoard != null ? model.wipBoard.SmdSolderMask : null);
             return View(model);
         }
+
         [HttpPost]
         public async Task<IActionResult> PCS003Async(WipDataViewModel model, string action, IFormFile formFile)
         {
+            // 針對安勤 工單基本資料統一打開工程資訊
+            ViewBag.WipSpecial = _configuration["WipSpecial"];
 
             try
             {
-
                 #region 選單
-                
-
+                await WipDataSelectAll(model.wipAtt.WipNO, model.wipAtt.ItemNO, model.wipInfo.UnitNO);
+                GetCheckboxApproveLogo(model.wipLabel != null ? model.wipLabel.ApproveLogo : null);
+                GetCheckboxCompanyLogo(model.wipLabel != null ? model.wipLabel.CompanyLogo : null);
+                GetCheckboxPrintMode(model.wipLabel != null ? model.wipLabel.PrintMode : null);
+                GetCheckboxWipAttr(model.wipLabel != null ? model.wipLabel.WipAttr : null);
+                GetCheckboxDIP(model.wipBoard != null ? model.wipBoard.DipSide : null);
+                GetCheckboxSMD(model.wipBoard != null ? model.wipBoard.Smd : null);
+                GetCheckboxSMDSolderMa(model.wipBoard != null ? model.wipBoard.SmdSolderMask : null);
                 #endregion
 
                 model.ruleStations = await _pcsApi.GetRuleStationByWipNo(model.wipInfo.WipNO);
@@ -2004,8 +2110,8 @@ namespace AMESCoreStudio.Web.Controllers
                     model.wipLabel.WipNO = model.wipInfo.WipNO;
                     await _pcsApi.PutWipLabel(JsonConvert.SerializeObject(model.wipLabel));
 
-                    // 系統
-                    if (model.wipInfo.UnitNO == "B" || model.wipInfo.UnitNO == "P" || model.wipInfo.UnitNO == "T")
+                    // 安勤統一執行WIP_SYSTEM
+                    if (ViewBag.WipSpecial == "Y")
                     {
                         if (string.IsNullOrWhiteSpace(CheckWipInfoInsert_WipSystem(model.wipSystem)))
                         {
@@ -2018,18 +2124,34 @@ namespace AMESCoreStudio.Web.Controllers
                         }
                     }
                     else
-                    // 板卡
                     {
-                        if (string.IsNullOrWhiteSpace(CheckWipInfoInsert_WipBoard(model.wipBoard)))
+                        // 系統
+                        if (model.wipInfo.UnitNO == "B" || model.wipInfo.UnitNO == "P" || model.wipInfo.UnitNO == "T")
+                        {
+                            if (string.IsNullOrWhiteSpace(CheckWipInfoInsert_WipSystem(model.wipSystem)))
+                            {
+                                if (!string.IsNullOrWhiteSpace(model.wipSystem.BiTemperature))
+                                {
+                                    model.wipSystem.ItemNo = model.wipAtt.ItemNO;
+                                    model.wipSystem.WipNo = model.wipInfo.WipNO;
+                                    await _pcsApi.PutWipSystem(JsonConvert.SerializeObject(model.wipSystem));
+                                }
+                            }
+                        }
+                        else
+                        // 板卡
                         {
-                            if (!string.IsNullOrWhiteSpace(model.wipBoard.BiTemperature))
+                            if (string.IsNullOrWhiteSpace(CheckWipInfoInsert_WipBoard(model.wipBoard)))
                             {
-                                model.wipBoard.Smd = model.wipBoard.SMDs == null ? null : string.Join(',', model.wipBoard.SMDs);
-                                model.wipBoard.SmdSolderMask = model.wipBoard.SmdSolderMasks == null ? null : string.Join(',', model.wipBoard.SmdSolderMasks);
-                                model.wipBoard.DipSide = model.wipBoard.DipSides == null ? null : string.Join(',', model.wipBoard.DipSides);
-                                model.wipBoard.ItemNo = model.wipAtt.ItemNO;
-                                model.wipBoard.WipNo = model.wipInfo.WipNO;
-                                await _pcsApi.PutWipBoard(JsonConvert.SerializeObject(model.wipBoard));
+                                if (!string.IsNullOrWhiteSpace(model.wipBoard.BiTemperature))
+                                {
+                                    model.wipBoard.Smd = model.wipBoard.SMDs == null ? null : string.Join(',', model.wipBoard.SMDs);
+                                    model.wipBoard.SmdSolderMask = model.wipBoard.SmdSolderMasks == null ? null : string.Join(',', model.wipBoard.SmdSolderMasks);
+                                    model.wipBoard.DipSide = model.wipBoard.DipSides == null ? null : string.Join(',', model.wipBoard.DipSides);
+                                    model.wipBoard.ItemNo = model.wipAtt.ItemNO;
+                                    model.wipBoard.WipNo = model.wipInfo.WipNO;
+                                    await _pcsApi.PutWipBoard(JsonConvert.SerializeObject(model.wipBoard));
+                                }
                             }
                         }
                     }
@@ -2194,14 +2316,17 @@ namespace AMESCoreStudio.Web.Controllers
                 };
                 if (action == "生管確認")
                 {
+                    wipCheck.PMCUserID = UserID;
                     await _pcsApi.PutWipCheckByPMC(JsonConvert.SerializeObject(wipCheck));
                 }
                 else if (action == "工程確認")
                 {
+                    wipCheck.PEUserID = UserID;
                     await _pcsApi.PutWipCheckByPE(JsonConvert.SerializeObject(wipCheck));
                 }
                 else if (action == "製造確認")
                 {
+                    wipCheck.MFUserID = UserID;
                     await _pcsApi.PutWipCheckByMF(JsonConvert.SerializeObject(wipCheck));
                 }
 
@@ -2237,7 +2362,7 @@ namespace AMESCoreStudio.Web.Controllers
         /// <param name="ItemNo">工單料號</param>
         /// <param name="UnitNo">生產單位</param>
         /// <returns></returns>
-        public async Task WipDataSelectAll(string WipNo = null , string ItemNo = null , string UnitNo=null)
+        public async Task WipDataSelectAll(string WipNo = null, string ItemNo = null, string UnitNo = null)
         {
             // KP Items
             await GetItemsList();
@@ -2281,6 +2406,10 @@ namespace AMESCoreStudio.Web.Controllers
             GetWipSystemTypeSelect();
             // 工程資訊 Power Model 
             GetWipSystemPMTypeSelect();
+            // 燒機溫度
+            GetWipBITemperatuerSelect();
+            // 燒機軟體
+            GetWipBI_OSSelect();
             // SOP Type
             GetSOPTypeSelect();
 
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
index 45dd0ddb..3eb484c0 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
@@ -1,10 +1,12 @@
 @model AMESCoreStudio.Web.ViewModels.PCS.WipDataViewModel
-
+@using Microsoft.AspNetCore.Mvc.Localization
 
 @{ ViewData["Title"] = "PCS001C";
     Layout = "~/Views/Shared/_AMESLayout.cshtml";
 }
 
+@inject IHtmlLocalizer<AMESCoreStudio.Web.SharedResource> sharedLocalizer
+
 <style>
     .control-label {
         justify-content: flex-end !important;
@@ -28,6 +30,7 @@
             <div class="layui-form-item">
                 <div class="layui-inline">
                     <label asp-for="wipInfo.WipNO" class="layui-form-label"></label>
+                    <label asp-for="wipInfo.WipNO" class="layui-form-label">@sharedLocalizer["SYSTEM_ID"]</label>
                     <div class="layui-input-inline">
 
                         <input asp-for="wipInfo.WipNO" class="layui-input" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" placeholder="請輸入工單號碼" />
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
index 68a19015..f66c16df 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
@@ -128,7 +128,7 @@
             <div class="layui-form-item">
                 <label asp-for="wipInfo.Remarks" class="layui-form-label"></label>
                 <div class="layui-input-block">
-                    <input asp-for="wipInfo.Remarks" class="layui-input" />
+                    <textarea asp-for="wipInfo.Remarks" class="layui-textarea"></textarea>
                 </div>
             </div>
 
@@ -152,7 +152,7 @@
                     <li>Keypart組合</li>
                     <li>生產流程</li>
                     <li id="board">板卡-工程資訊</li>
-                    <li id="system">系統-工程資訊</li>
+                    <li id="system">工程資訊</li>
                     <li>治具組合</li>
                     <li>SOP文件</li>
                     <li>標籤選項</li>
@@ -471,8 +471,8 @@
                                     <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipTape == "Y" ? "checked" : "") } type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" />
                                     <input @if (Model.wipBoard != null) { @(Model.wipBoard.DipSolderMask == "Y" ? "checked" : "") } type="checkbox" title="點防焊膠" name="wipBoard.SmdSolderMask" />
                                     @*<input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" />
-                                        <input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" />
-                                        <input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@
+                        <input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" />
+                        <input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@
                                 </div>
                             </div>
                         </div>
@@ -693,93 +693,141 @@
                                         <input asp-for="wipSystem.BiRatio" class="layui-input" />
                                     </div>
                                 </div>
-                                <div class="layui-input-inline">
-                                    <label asp-for="wipSystem.BiTemperature" class="layui-form-label"></label>
-                                    <div class="layui-input-block">
-                                        <input asp-for="wipSystem.BiTemperature" class="layui-input" />
-                                    </div>
-                                </div>
                                 <div class="layui-input-inline">
                                     <label asp-for="wipSystem.BiTime" class="layui-form-label"></label>
                                     <div class="layui-input-block">
                                         <input asp-for="wipSystem.BiTime" class="layui-input" />
                                     </div>
                                 </div>
-                                <label asp-for="wipSystem.BiMemo" class="layui-form-label"></label>
-                                <div class="layui-input-inline">
-                                    <input asp-for="wipSystem.BiMemo" class="layui-input" />
+                                <label asp-for="wipSystem.BiTemperature" class="layui-form-label"></label>
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <select disabled asp-for="wipSystem.BiTemperature" asp-items="@ViewBag.GetWipBITemperatuerSelect" class=""></select>
+                                </div>
+                                <label asp-for="wipSystem.BI_OS" class="layui-form-label"></label>
+                                <div class="layui-input-inline" style="width:200px;">
+                                    <select disabled asp-for="wipSystem.BI_OS" asp-items="@ViewBag.GetWipBI_OSSelect" class=""></select>
                                 </div>
                             </div>
                         </div>
 
+                        <div class="layui-form-item">
+                            <label asp-for="wipSystem.BiMemo" class="layui-form-label"></label>
+                            <div class="layui-input-block">
+                                <textarea asp-for="wipSystem.BiMemo" class="layui-textarea"></textarea>
+                            </div>
+                        </div>
+
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label asp-for="wipSystem.BiosVer" class="layui-form-label"></label>
-                                <div class="layui-input-inline">
+                                <label class="layui-form-label">BIOS</label>
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <select disabled asp-for="wipSystem.BiosType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
+                                </div>
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" asp-for="wipSystem.Bios" autocomplete="off" />
+                                </div>
+                                <div class="layui-input-inline" style="width:300px;">
+                                    <input class="layui-input" asp-for="wipSystem.Bios_Desc" readonly="readonly" />
+                                </div>
+                                <label class="layui-form-label">Ver.</label>
+                                <div class="layui-input-inline" style="width:80px;">
                                     <input asp-for="wipSystem.BiosVer" class="layui-input" />
                                 </div>
+                                <label class="layui-form-label">CS.</label>
+                                <div class="layui-input-inline" style="width:80px;">
+                                    <input asp-for="wipSystem.Checksum" style="width:80px;" class="layui-input" />
+                                </div>
+                            </div>
+                        </div>
 
-                                <label asp-for="wipSystem.Checksum" class="layui-form-label">Checksum</label>
-                                <div class="layui-input-inline">
-                                    <input asp-for="wipSystem.Checksum" class="layui-input" />
+                        <div class="layui-form-item">
+                            <div class="layui-inline">
+                                <label class="layui-form-label">EC</label>
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <select disabled asp-for="wipSystem.ECType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
+                                </div>
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" asp-for="wipSystem.Ec" autocomplete="off" />
+                                </div>
+                                <div class="layui-input-inline" style="width:300px;">
+                                    <input class="layui-input" asp-for="wipSystem.Ec_Desc" readonly="readonly" />
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label class="layui-form-label" asp-for="wipSystem.Cpu"></label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Cpu" autocomplete="off" />
+                                <label class="layui-form-label">FW</label>
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <select disabled asp-for="wipSystem.FWType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
                                 </div>
-                                <label class="layui-form-label" asp-for="wipSystem.Ram"></label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Ram" autocomplete="off" />
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" asp-for="wipSystem.Fw" 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 class="layui-input-inline" style="width: 300px;">
+                                    <input class="layui-input" asp-for="wipSystem.Fw_Desc" readonly="readonly" />
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label class="layui-form-label">EC</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Ec" autocomplete="off" />
+                                <label class="layui-form-label">FW1</label>
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <select disabled asp-for="wipSystem.FW1Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
+                                </div>
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" asp-for="wipSystem.Fw1" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" />
+                                </div>
+                                <div class="layui-input-inline" style="width: 300px; ">
+                                    <input class="layui-input" asp-for="wipSystem.Fw1_Desc" readonly="readonly" />
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label class="layui-form-label">FW</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Fw" autocomplete="off" />
+                                <label class="layui-form-label">FW2</label>
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <select disabled asp-for="wipSystem.FW2Type" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
+                                </div>
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" asp-for="wipSystem.Fw2" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" />
+                                </div>
+                                <div class="layui-input-inline" style="width: 300px;">
+                                    <input class="layui-input" asp-for="wipSystem.Fw2_Desc" readonly="readonly" />
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label class="layui-form-label">FW1</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Fw1" autocomplete="off" />
+                                <label class="layui-form-label" asp-for="wipSystem.OsVer"></label>
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <select disabled asp-for="wipSystem.OsType" asp-items="@ViewBag.GetWipSystemTypeSelect" class=""></select>
+                                </div>
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <input class="layui-input autocomplete" onkeypress="if( event.keyCode == 13 ) { return false; }" asp-for="wipSystem.OsVer" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" />
+                                </div>
+                                <div class="layui-input-inline" style="width: 300px;">
+                                    <input class="layui-input" asp-for="wipSystem.OsVer_Desc" readonly="readonly" />
                                 </div>
                             </div>
                         </div>
 
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label class="layui-form-label">FW2</label>
+                                <label class="layui-form-label" asp-for="wipSystem.Cpu"></label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" asp-for="wipSystem.Cpu" autocomplete="off" />
+                                </div>
+                                <label class="layui-form-label" asp-for="wipSystem.Ram"></label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" asp-for="wipSystem.Fw2" autocomplete="off" />
+                                    <input class="layui-input" asp-for="wipSystem.Ram" autocomplete="off" />
                                 </div>
                             </div>
                         </div>
 
-
                         <div class="layui-form-item">
                             <div class="layui-inline">
                                 <label class="layui-form-label">FINE_PACKAGE</label>
@@ -926,7 +974,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">備註</label>
                             <div class="layui-input-block">
-                                <input asp-for="wipLabel.Remarks" class="layui-input" type="text" />
+                                <textarea asp-for="wipLabel.Remarks" class="layui-textarea"></textarea>
                             </div>
                         </div>
                     </div>
@@ -939,6 +987,7 @@
                                     <tr>
                                         <th lay-data="{field:'username', width:100}">檔案名稱</th>
                                         <th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th>
+                                        <th lay-data="{field:'right', width:80, sort:true}">預覽</th>
                                     </tr>
                                 </thead>
                                 <tbody>
@@ -946,11 +995,13 @@
                                     {
                                         <tr>
                                             <td>
-
-                                                @index.ImageName
+                                                <span id="FileName">@index.ImageName</span>
+                                            </td>
+                                            <td>
+                                                <span id="Filepath">@index.Filepath</span>
                                             </td>
                                             <td>
-                                                @index.Filepath
+                                                <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" onclick="show(this)">預覽</a>
                                             </td>
                                         </tr>
                                     }
@@ -968,13 +1019,19 @@
     <script type="text/javascript">
 
         $(document).ready(function () {
-            if ($("#unitNo").val() == "B" || $("#unitNo").val() == "P" || $("#unitNo").val() == "T") {
-                $("#system").show();
-                $("#board").hide();
-            }
-            else {
-                $("#system").hide();
-                $("#board").show();
+             // 安勤統一只Show工程資訊
+            $("#system").show();
+            $("#board").hide();
+
+            if ("@ViewBag.WipSpecial" == "N") {
+                if ($("#unitNo").val() == "B" || $("#unitNo").val() == "P" || $("#unitNo").val() == "T") {
+                    $("#system").show();
+                    $("#board").hide();
+                }
+                else {
+                    $("#system").hide();
+                    $("#board").show();
+                }
             }
 
             $(":input").attr("disabled", "disabled");
@@ -1015,6 +1072,24 @@
             //});
         });
 
+        //通过行tool编辑，lay-event="show"
+        function show(obj) {
+            var Path = $(obj).closest("TR").find('span[id*=Filepath]').text();;
+            var FileName = $(obj).closest("TR").find('span[id*=FileName]').text();;
+            layui.use('layer', function () {
+                var layer = layui.layer;
+                layer.open({
+                    type: 2,
+                    title: '預覽文件',
+                    shadeClose: true,//点击遮罩关闭层
+                    shade: 0.8,
+                    area: ['90%', '90%'],
+                    zIndex: 19891014,
+                    content: "../../" + Path + FileName
+                });
+            });
+        };
+
         var tableCols = [[
             {
                 field: 'unitName',
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index b455b8a4..a3750b38 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -134,7 +134,7 @@
             <div class="layui-form-item">
                 <label asp-for="wipInfo.Remarks" class="layui-form-label"></label>
                 <div class="layui-input-block">
-                    <input asp-for="wipInfo.Remarks" class="layui-input" />
+                    <textarea asp-for="wipInfo.Remarks" class="layui-textarea"></textarea>
                 </div>
             </div>
 
@@ -158,7 +158,7 @@
                     <li>Keypart組合</li>
                     <li>生產流程</li>
                     <li id="board">板卡-工程資訊</li>
-                    <li id="system">系統-工程資訊</li>
+                    <li id="system">工程資訊</li>
                     <li>治具組合</li>
                     <li>SOP文件</li>
                     <li>標籤選項</li>
@@ -733,25 +733,30 @@
                                         <input asp-for="wipSystem.BiRatio" class="layui-input" />
                                     </div>
                                 </div>
-                                <div class="layui-input-inline">
-                                    <label asp-for="wipSystem.BiTemperature" class="layui-form-label"></label>
-                                    <div class="layui-input-block">
-                                        <input asp-for="wipSystem.BiTemperature" class="layui-input" />
-                                    </div>
-                                </div>
                                 <div class="layui-input-inline">
                                     <label asp-for="wipSystem.BiTime" class="layui-form-label"></label>
                                     <div class="layui-input-block">
                                         <input asp-for="wipSystem.BiTime" class="layui-input" />
                                     </div>
                                 </div>
-                                <label asp-for="wipSystem.BiMemo" class="layui-form-label"></label>
-                                <div class="layui-input-inline">
-                                    <input asp-for="wipSystem.BiMemo" class="layui-input" />
+                                <label asp-for="wipSystem.BiTemperature" class="layui-form-label"></label>
+                                <div class="layui-input-inline" style="width:150px;">
+                                    <select asp-for="wipSystem.BiTemperature" asp-items="@ViewBag.GetWipBITemperatuerSelect" class=""></select>
+                                </div>
+                                <label asp-for="wipSystem.BI_OS" class="layui-form-label"></label>
+                                <div class="layui-input-inline" style="width:200px;">
+                                    <select asp-for="wipSystem.BI_OS" asp-items="@ViewBag.GetWipBI_OSSelect" class=""></select>
                                 </div>
                             </div>
                         </div>
 
+                        <div class="layui-form-item">
+                            <label asp-for="wipSystem.BiMemo" class="layui-form-label"></label>
+                            <div class="layui-input-block">
+                                <textarea asp-for="wipSystem.BiMemo" class="layui-textarea"></textarea>
+                            </div>
+                        </div>
+
                         <div class="layui-form-item">
                             <div class="layui-inline">
                                 <label class="layui-form-label">BIOS</label>
@@ -875,7 +880,7 @@
                         <div class="layui-form-item">
                             <div class="layui-inline">
                                 <label class="layui-form-label" asp-for="wipSystem.DmiBi"></label>
-                                <div class="layui-input-inline">    
+                                <div class="layui-input-inline">
                                     <select asp-for="wipSystem.DmiBi" asp-items="@ViewBag.GetWipSystemDMITypeSelect" class=""></select>
                                 </div>
                             </div>
@@ -1036,7 +1041,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">備註</label>
                             <div class="layui-input-block">
-                                <input asp-for="wipLabel.Remarks" class="layui-input" type="text" />
+                                <textarea asp-for="wipLabel.Remarks" class="layui-textarea"></textarea>
                             </div>
                         </div>
                         <div style="text-align:right">
@@ -1052,6 +1057,7 @@
                                     <tr>
                                         <th lay-data="{field:'username', width:100}">檔案名稱</th>
                                         <th lay-data="{field:'experience', width:80, sort:true}">檔案路徑</th>
+                                        <th lay-data="{field:'right', width:80, sort:true}">預覽</th>
                                     </tr>
                                 </thead>
                                 <tbody>
@@ -1059,11 +1065,13 @@
                                     {
                                         <tr>
                                             <td>
-
-                                                @index.ImageName
+                                                <span id="FileName">@index.ImageName</span>
+                                            </td>
+                                            <td>
+                                                <span id="Filepath">@index.Filepath</span>
                                             </td>
                                             <td>
-                                                @index.Filepath
+                                                <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-read" onclick="show(this)">預覽</a>
                                             </td>
                                         </tr>
                                     }
@@ -1103,13 +1111,19 @@
                 parent.hg.msg(error);
             }
 
-            if ($("#unitNo").val() == "B" || $("#unitNo").val() == "P" || $("#unitNo").val() == "T") {
-                $("#system").show();
-                $("#board").hide();
-            }
-            else {
-                $("#system").hide();
-                $("#board").show();
+            // 安勤統一只Show工程資訊
+            $("#system").show();
+            $("#board").hide();
+
+            if ("@ViewBag.WipSpecial" == "N") {
+                if ($("#unitNo").val() == "B" || $("#unitNo").val() == "P" || $("#unitNo").val() == "T") {
+                    $("#system").show();
+                    $("#board").hide();
+                }
+                else {
+                    $("#system").hide();
+                    $("#board").show();
+                }
             }
 
             // DIV 出貨序號
@@ -1280,8 +1294,27 @@
                 RuleStation(data.value);
             });
 
+
         });
 
+        //通过行tool编辑，lay-event="show"
+        function show(obj) {
+            var Path = $(obj).closest("TR").find('span[id*=Filepath]').text();;
+            var FileName = $(obj).closest("TR").find('span[id*=FileName]').text();;
+            layui.use('layer', function () {
+                var layer = layui.layer;
+                layer.open({
+                    type: 2,
+                    title: '預覽文件',
+                    shadeClose: true,//点击遮罩关闭层
+                    shade: 0.8,
+                    area: ['90%', '90%'],
+                    zIndex: 19891014,
+                    content: "../../" + Path + FileName
+                });
+            });
+        };
+
         function getFlowRuleList(data)
         {
             $.ajax(
diff --git a/AMESCoreStudio.Web/appsettings.json b/AMESCoreStudio.Web/appsettings.json
index 7694543c..51b4cf49 100644
--- a/AMESCoreStudio.Web/appsettings.json
+++ b/AMESCoreStudio.Web/appsettings.json
@@ -10,5 +10,7 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  // �w��w�� �u��򥻸�ƲΤ@���}�u�{��T
+  "WipSpecial": "Y"
 }
diff --git a/AMESCoreStudio.WebApi/Enums/EnumPCS.cs b/AMESCoreStudio.WebApi/Enums/EnumPCS.cs
index 295e03d5..26c5d7bc 100644
--- a/AMESCoreStudio.WebApi/Enums/EnumPCS.cs
+++ b/AMESCoreStudio.WebApi/Enums/EnumPCS.cs
@@ -201,6 +201,109 @@ namespace AMESCoreStudio.WebApi.Enum
 
         }
 
+        /// <summary>
+        /// 燒機時間
+        /// </summary>
+        public enum EnumWipBITemperatuer
+        {
+            /// <summary>
+            /// NA
+            /// </summary>
+            [Display(Name = "NA")]
+            N = 1,
+
+            /// <summary>
+            /// 室溫
+            /// </summary>
+            [Display(Name = "室溫")]
+            A = 2,
+
+            /// <summary>
+            /// -40~+85度
+            /// </summary>
+            [Display(Name = "-40~+85度")]
+            B = 3,
+
+            /// <summary>
+            /// -20~+70度
+            /// </summary>
+            [Display(Name = "-20~+70度")]
+            D = 4,
+
+            /// <summary>
+            /// 50度
+            /// </summary>
+            [Display(Name = "50度")]
+            E = 5,
+
+            /// <summary>
+            /// 55度
+            /// </summary>
+            [Display(Name = "55度")]
+            F = 6,
+
+            /// <summary>
+            /// 40度
+            /// </summary>
+            [Display(Name = "40度")]
+            G = 7,
+        }
+
+        /// <summary>
+        /// 燒機軟體
+        /// </summary>
+        public enum EnumWipBI_OS
+        {
+            /// <summary>
+            /// NA
+            /// </summary>
+            [Display(Name = "NA")]
+            N = 1,
+
+            /// <summary>
+            /// Memtest86
+            /// </summary>
+            [Display(Name = "Memtest86")]
+            A = 2,
+
+            /// <summary>
+            /// Burnin test
+            /// </summary>
+            [Display(Name = "Burnin test")]
+            B = 3,
+
+            /// <summary>
+            /// Memtest86+Burnin test
+            /// </summary>
+            [Display(Name = "Memtest86+Burnin test")]
+            D = 4,
+
+            /// <summary>
+            /// Power onoff+Burnin test
+            /// </summary>
+            [Display(Name = "Power onoff + Burnin test")]
+            E = 5,
+
+            /// <summary>
+            /// Android APP
+            /// </summary>
+            [Display(Name = "Android APP")]
+            F = 6,
+
+            /// <summary>
+            /// QA Plus
+            /// </summary>
+            [Display(Name = "QA Plus")]
+            G = 7,
+
+
+            /// <summary>
+            /// Stress test
+            /// </summary>
+            [Display(Name = "Stress test")]
+            H = 8,
+        }
+
         /// <summary>
         /// SOP Type
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs b/AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs
index 8c42b657..e7d790e9 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs
@@ -66,7 +66,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("BI_RATIO")]
         [DataMember]
         [Display(Name = "燒機比率")]
-        [Required(ErrorMessage = "{0},不能空白")]
         public decimal BiRatio { get; set; }
 
         /// <summary>
@@ -76,19 +75,27 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [StringLength(20)]
         [DataMember]
         [Display(Name = "燒機溫度")]
-        [Required(ErrorMessage = "{0},不能空白")]
         public string BiTemperature { get; set; }
 
         /// <summary>
         /// 燒機時間
         /// </summary>
-        [Required(ErrorMessage = "{0},不能空白")]
         [Column("BI_TIME")]
         [StringLength(20)]
         [DataMember]
         [Display(Name = "燒機時間")]
         public string BiTime { get; set; }
 
+
+        /// <summary>
+        /// 燒機軟體
+        /// </summary>
+        [Column("BI_OS")]
+        [StringLength(20)]
+        [DataMember]
+        [Display(Name = " 燒機軟體")]
+        public string BI_OS { get; set; }
+
         /// <summary>
         /// 燒機備註
         /// </summary>
@@ -112,7 +119,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Display(Name = "BIOS")]
         [Column("BIOS")]
-        [Required(ErrorMessage = "{0},不能空白")]
         public string Bios { get; set; }
 
         /// <summary>
@@ -121,13 +127,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Display(Name = "BIOS版本")]
         [Column("BIOS_VER")]
-        [Required(ErrorMessage = "{0},不能空白")]
         public string BiosVer { get; set; }
 
         /// <summary>
         /// Check Sum
         /// </summary>
-        [Required(ErrorMessage = "{0},不能空白")]
         [Column("CHECKSUM")]
         [StringLength(20)]
         [DataMember]
@@ -155,7 +159,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 是否為精包裝Y/N
         /// </summary>
-        [Required]
         [Column("FINE_PACKAGE")]
         [StringLength(2)]
         [DataMember]
@@ -255,7 +258,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// JUMPER設定
         /// </summary>
         [Column("JUMPER")]
-        [StringLength(200)]
         [DataMember]
         [Display(Name = "JUMPER設定")]
         public string Jumper { get; set; }