diff --git a/AMESCoreStudio.Web/Controllers/RPTController.cs b/AMESCoreStudio.Web/Controllers/RPTController.cs
index 3bf006bb..91c2c91e 100644
--- a/AMESCoreStudio.Web/Controllers/RPTController.cs
+++ b/AMESCoreStudio.Web/Controllers/RPTController.cs
@@ -2024,7 +2024,7 @@ namespace AMESCoreStudio.Web.Controllers
         private async Task GetProductType()
         {
 
-            var result = await _pcsApi.GetProductTypes();
+            var result = await _esunApi.GetProductTypes();
 
             var ProductTypes = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
@@ -2047,7 +2047,7 @@ namespace AMESCoreStudio.Web.Controllers
         /// <returns></returns>
         private async Task GetLineInfo(string UnitNo = null)
         {
-            var result = await _pcsApi.GetLineInfo();
+            var result = await _esunApi.GetLineInfo();
             result = result.Where(w => w.StatusNo == "A").OrderBy(o => o.LineID).ToList();
 
             // 有生產製程 多判斷生產製程
@@ -2074,7 +2074,7 @@ namespace AMESCoreStudio.Web.Controllers
         /// <returns></returns>
         private async Task GetFactoryInfo()
         {
-            var result = await _pcsApi.GetFactoryInfo();
+            var result = await _esunApi.GetFactoryInfo();
             result = result.Where(w => w.StatusNo == "A").OrderBy(o => o.FactoryID).ToList();
             var FactoryInfo = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
@@ -2090,33 +2090,13 @@ namespace AMESCoreStudio.Web.Controllers
             ViewBag.FactoryInfoList = FactoryInfo;
         }
 
-        /// <summary>
-        /// 組件資料
-        /// </summary>
-        /// <returns></returns>
-        private async Task GetItems()
-        {
-            var result = await _pcsApi.GetItems();
-
-            // 只有狀態是啟用的
-            result = result.Where(w => w.StatusNo == "A").OrderBy(o => o.ItemName).ToList();
-
-            var ItemsList = new List<SelectListItem>();
-            ItemsList.Add(new SelectListItem("請選擇", ""));
-            for (int i = 0; i < result.Count; i++)
-            {
-                ItemsList.Add(new SelectListItem(result[i].ItemName, result[i].ItemNo.ToString()));
-            }
-            ViewBag.ItemsList = ItemsList;
-        }
-
         /// <summary>
         /// 正背面
         /// </summary>
         /// <returns></returns>
         private async Task GetMFGType()
         {
-            var result = await _pcsApi.GetMFGTypes();
+            var result = await _esunApi.GetMFGTypes();
             var MFGType = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
             {
@@ -2137,7 +2117,7 @@ namespace AMESCoreStudio.Web.Controllers
         /// <returns></returns>
         private async Task GetProcessTypes()
         {
-            var result = await _pcsApi.GetProcessTypes();
+            var result = await _esunApi.GetProcessTypes();
 
             var ProcessType = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IESUN.cs b/AMESCoreStudio.Web/HttpApis/AMES/IESUN.cs
index 46380ac5..ef25545f 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/IESUN.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/IESUN.cs
@@ -165,5 +165,41 @@ namespace AMESCoreStudio.Web
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("http://192.168.4.109:5088/api/WipBarcodeOther/WipNo/{id}")]
         ITask<WipBarcodeOther> GetWipBarcodeOther(string id);
+
+        /// <summary>
+        /// 廠別/委外廠
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("http://192.168.4.109:5088/api/FactoryInfoes")]
+        ITask<List<AMESCoreStudio.WebApi.Models.BAS.FactoryInfo>> GetFactoryInfo();
+
+        /// <summary>
+        /// 線別
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("http://192.168.4.109:5088/api/LineInfoes")]
+        ITask<List<AMESCoreStudio.WebApi.Models.BAS.LineInfo>> GetLineInfo();
+
+        /// <summary>
+        /// 產品別
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("http://192.168.4.109:5088/api/ProductTypes")]
+        ITask<List<ProductType>> GetProductTypes();
+
+        /// <summary>
+        /// 工單類型
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("http://192.168.4.109:5088/api/ProcessTypes")]
+        ITask<List<ProcessType>> GetProcessTypes();
+
+        /// <summary>
+        /// 正背面
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("http://192.168.4.109:5088/api/MFGTypes")]
+        ITask<List<MFGType>> GetMFGTypes();
+
     }
 }
diff --git a/AMESCoreStudio.Web/Views/RPT/RPT005.cshtml b/AMESCoreStudio.Web/Views/RPT/RPT005.cshtml
index 67049f22..e327d363 100644
--- a/AMESCoreStudio.Web/Views/RPT/RPT005.cshtml
+++ b/AMESCoreStudio.Web/Views/RPT/RPT005.cshtml
@@ -79,7 +79,7 @@
             table.on('tool(query)', function (obj) {
                 if (obj.event == 'detail') {
                     if (obj.data.wipID) {
-                        hg.open('檢視工單資料', '/RPT/RPT004R/' + obj.data.wipID, '', '', true);
+                        hg.open('檢視昶亨工單資料', '/RPT/RPT005R/' + obj.data.wipID, '', '', true);
                     }
                 }
             });
@@ -175,11 +175,11 @@
         //通过行tool檢視，lay-event="detail"
         function detail(obj) {
             if (obj.data.wipID) {
-                hg.open('檢視工單資料', '/RPT/RPT005R/' + obj.data.wipID, '', '', true);
+                hg.open('檢視昶亨工單資料', '/RPT/RPT005R/' + obj.data.wipID, '', '', true);
             }
         }
 
-        var table = hg.table.datatable('query', '工單資料查詢', '/RPT/RPT005Query', {}, tableCols, "", true, 'full-100', ['filter', 'print', 'exports']);
+        var table = hg.table.datatable('query', '昶亨工單資料查詢', '/RPT/RPT005Query', {}, tableCols, "", true, 'full-100', ['filter', 'print', 'exports']);
     </script>
     <script type="text/html" id="statusNoName">
         {{#  if(d.statusNo === 'E'){ }}
diff --git a/AMESCoreStudio.Web/Views/RPT/RPT005R.cshtml b/AMESCoreStudio.Web/Views/RPT/RPT005R.cshtml
index 31e78816..1a9e1174 100644
--- a/AMESCoreStudio.Web/Views/RPT/RPT005R.cshtml
+++ b/AMESCoreStudio.Web/Views/RPT/RPT005R.cshtml
@@ -844,16 +844,15 @@
     <script type="text/javascript">
 
         $(document).ready(function () {
-            if ("@ViewBag.WipSpecial" == "N") {
-                if ($("#unitNo").val() == "B" || $("#unitNo").val() == "O" || $("#unitNo").val() == "T") {
-                    $("#system").show();
-                    $("#board").hide();
-                }
-                else {
-                    $("#system").hide();
-                    $("#board").show();
-                }
+            if ($("#unitNo").val() == "B" || $("#unitNo").val() == "O" || $("#unitNo").val() == "T") {
+                $("#system").show();
+                $("#board").hide();
             }
+            else {
+                $("#system").hide();
+                $("#board").show();
+            }
+
 
             $(":input").attr("disabled", "disabled");
         });