From 53117382acc6b2807c5aac89e0ffefd469042e03 Mon Sep 17 00:00:00 2001
From: Yiru <yiru@aten.com.tw>
Date: Mon, 2 Oct 2023 12:40:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=B7=A1=E6=AA=A2=E4=BD=9C?=
 =?UTF-8?q?=E6=A5=AD=E6=9F=A5=E8=A9=A2PLM=5FECN=E5=A4=B1=E6=95=97=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/SPCController.cs              |  9 +++
 AMESCoreStudio.Web/HttpApis/AMES/ISPC.cs      |  6 ++
 AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml   | 65 ++++++++++---------
 AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml   | 29 +++++++--
 4 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/SPCController.cs b/AMESCoreStudio.Web/Controllers/SPCController.cs
index 87fd3cbc..441e4322 100644
--- a/AMESCoreStudio.Web/Controllers/SPCController.cs
+++ b/AMESCoreStudio.Web/Controllers/SPCController.cs
@@ -1267,6 +1267,15 @@ namespace AMESCoreStudio.Web.Controllers
             //return Json(new Result() { success = true, msg = "資料有誤!!" });
         }
 
+
+        [HttpPost]
+        public async Task<IActionResult> SPC005GetPLMECN(string ItemNo)
+        {
+            IResultModel<string> result;
+            result = await _spcApi.GetPLMEcn(ItemNo);
+            return Json(result);
+        }
+
         [ResponseCache(Duration = 0)]
         [HttpGet]
         public async Task<IActionResult> GetInspectionResultMastersAsync()
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/ISPC.cs b/AMESCoreStudio.Web/HttpApis/AMES/ISPC.cs
index 51999830..b81750ea 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/ISPC.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/ISPC.cs
@@ -338,6 +338,12 @@ namespace AMESCoreStudio.Web
         ITask<ResultModel<string>> PutInspectionResultDetailForType([FromBody, RawJsonContent] string model);
 
 
+        /// <summary>
+        /// FQC007 取PLM ECN
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/GetPLMData/Get_PLM_ECN")]
+        ITask<ResultModel<string>> GetPLMEcn(string ItemNo);
 
         #endregion
 
diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml
index 0c9be70a..82769dc8 100644
--- a/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml
+++ b/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml
@@ -69,10 +69,10 @@
                         </div>
 
                         <div class="layui-input-inline" style="width:25%;">
-                            <label class="control-label col-sm-2">PLMENC</label>
+                            <label class="control-label col-sm-2">PLM_ECN</label>
                             <div>
                                 <input type="text" readonly style="width:80%;display:inline" class="layui-input" id="PLMECN" />
-                                <a id="GetPLMECN" class="layui-btn layui-btn-sm layui-btn-normal" style="padding: 0 5px;" title="刷新PLM_ECN">
+                                <a onclick="GetPLM_ECN();" class="layui-btn layui-btn-sm layui-btn-normal" style="padding: 0 5px;" title="刷新PLM_ECN">
                                     <i class="layui-icon layui-icon-sm">&#xe669;</i>
                                 </a>
                             </div>
@@ -113,12 +113,12 @@
                 </div>
             </div>
             @*<div class="layui-inline">
-            <div class="layui-form-item">
-                <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
-                <button id="querysubmitTmp" class="layui-btn tt">暫存</button>
-                <button id="querysubmit" class="layui-btn tt">儲存</button>
-            </div>
-        </div>*@
+                <div class="layui-form-item">
+                    <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
+                    <button id="querysubmitTmp" class="layui-btn tt">暫存</button>
+                    <button id="querysubmit" class="layui-btn tt">儲存</button>
+                </div>
+            </div>*@
         </form>
         <form id="modeltable" method="post">
             <table class="layui-hide" id="test" lay-filter="test" lay-data="{id:'test'}"></table>
@@ -172,7 +172,7 @@
     @* <script type="text/html" id="selectUser">
             <input type="text" class="layui-input" style=" margin-top: -10px; margin-left: -10px; margin-right: -10px;" lay-vertype="tips" name="selectUser" value="" lay-event="inputTest" lay-filter="inputTest">
         </script>*@
-    <script type="text/javascript">
+<script type="text/javascript">
         ////儲存
         $('#querysubmit').click(function () {
             var WipNo = $("#WipNo").val();
@@ -198,7 +198,7 @@
         function insertMaster(status) {
             var data = $("#WipNo").val();
             if (data) {
-              
+
                 var Barcode = $("#BarcodeNo").val();
                 $.ajax({
                     url: '/SPC/CheckBarcodeNO?BarcodeNo=' + Barcode + '&WipNo=' + data,
@@ -213,7 +213,7 @@
                         }
                         else {
 
-                           
+
                             var model = $("#modelform").serializeArray();
                             //console.info(model);
                             var InspectionID;
@@ -272,11 +272,11 @@
 
                     }
                 });
-                    
-                
+
+
             }
 
-        
+
 
 
         };
@@ -518,7 +518,7 @@
             if (e.keyCode == 13 ) {
                 var data = $("#WipNo").val();
                 if (data) {
-                   
+
                     var Barcode = $("#BarcodeNo").val();
                     CheckBarcodeNo(Barcode, data);
                     event.preventDefault();
@@ -700,23 +700,28 @@
             });
         };
 
-      
+
         // PLM_ECN
-        $("#GetPLMECN").on("click", function () {
-            var ItemNo = $("#ItemNo").val();
-            $.ajax({
-                url: `http://plm935fs01:50786/RMA_GetLocation/QueryLastReleaseECN?item=${ItemNo}`,
-                type: "Get",
-                data: {},
-                success: function (result) {
-                    alert(resut.d);
-                    $('#PLMECN').val(result.d);
-                },
-                error: function (result) {
-                    alert(`呼叫API失敗`);
+       
+    function GetPLM_ECN() {
+        var ItemNo = $("#ItemNo").val();
+        $.ajax({
+            url: "@Url.Action("SPC005GetPLMECN", "SPC")",
+            type: "Post",
+            data: { "ItemNo": ItemNo },
+            success: function (result) {
+                if (result.success) {
+                    $('#PLMECN').val(result.msg);
                 }
-            });
+                else {
+                    alert(result.msg);
+                }
+            },
+            error: function (result) {
+                alert(`呼叫API失敗`);
+            }
         });
+    }
 
         // SMS異常
         $(".sms").click(function () {
@@ -740,7 +745,7 @@
                 parent.hg.msg(error);
             }
         });
-    </script>
+</script>
 
 
 }
diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml
index e3290084..0635a7fd 100644
--- a/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml
+++ b/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml
@@ -56,10 +56,10 @@
 
 
                         <div class="layui-input-inline" style="width:25%;">
-                            <label class="control-label col-sm-2">PLMENC</label>
+                            <label class="control-label col-sm-2">PLM_ECN</label>
                             <div>
                                 <input type="text" readonly style="width:80%;display:inline" class="layui-input" id="PLMECN" />
-                                <a id="GetPLMECN" class="layui-btn layui-btn-sm layui-btn-normal" style="padding: 0 5px;" title="刷新PLM_ECN">
+                                <a onclick="GetPLM_ECN();" class="layui-btn layui-btn-sm layui-btn-normal" style="padding: 0 5px;" title="刷新PLM_ECN">
                                     <i class="layui-icon layui-icon-sm">&#xe669;</i>
                                 </a>
                             </div>
@@ -180,7 +180,7 @@
         <script type="text/html" id="selectUser">
             <input type="text" name="selectUser" lay-filter="selectUser" id="selectUser" data-value={{d.missingUserID}} class="layui-input" style=" margin-top: -10px; margin-left: -10px; margin-right: -10px;">
         </script>*@
-    <script type="text/javascript">
+<script type="text/javascript">
         ////儲存
         $('#querysubmit').click(function () {
             var WipNo = $("#WipNo").val();
@@ -534,11 +534,30 @@
             });
         });
 
+      function GetPLM_ECN() {
+        var ItemNo = $("#ItemNo").val();
+        $.ajax({
+            url: "@Url.Action("SPC005GetPLMECN", "SPC")",
+            type: "Post",
+            data: { "ItemNo": ItemNo },
+            success: function (result) {
+                if (result.success) {
+                    $('#PLMECN').val(result.msg);
+                }
+                else {
+                    alert(result.msg);
+                }
+            },
+            error: function (result) {
+                alert(`呼叫API失敗`);
+            }
+        });
+      }
         // PLM_ECN
         $("#GetPLMECN").on("click", function () {
             var ItemNo = $("#ItemNo").val();
             $.ajax({
-                url: `http://plm935fs01:50786/RMA_GetLocation/QueryLastReleaseECN?item=${ItemNo}`,
+                url: 'http://plm935fs01:50786/RMA_GetLocation/QueryLastReleaseECN?item=' + ItemNo,
                 type: "Get",
                 data: {},
                 success: function (result) {
@@ -602,7 +621,7 @@
                 }
             };
         });
-    </script>
+</script>
 
 
 }