From 574ad6416b412aff7d62d07ae3e77ec287b238ca Mon Sep 17 00:00:00 2001
From: Ray <raylin@aten.com>
Date: Mon, 12 Sep 2022 16:50:43 +0800
Subject: [PATCH] =?UTF-8?q?1.=20FQC007=20=E5=8A=A0=E5=85=A5PLM=5FECN=20?=
 =?UTF-8?q?=E6=9F=A5=E8=A9=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/FQCController.cs              |  1 +
 AMESCoreStudio.Web/Views/FQC/FQC007.cshtml    | 66 +++++++++++++------
 2 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs
index 781b11d8..8805aece 100644
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@@ -855,6 +855,7 @@ namespace AMESCoreStudio.Web.Controllers
                     result_FQCResultMaster.Note = model.Note;
                     result_FQCResultMaster.ECN_Memo = model.ECN_Memo;
                     result_FQCResultMaster.InspectionStatus = model.InspectionStatus;
+                    result_FQCResultMaster.PLM_ECN = model.PLMECN;
                     await _fqcApi.PutFqcResultMaster(JsonConvert.SerializeObject(result_FQCResultMaster));
                     ModelState.AddModelError("error", "儲存成功!");
                 }
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
index d28dfa51..18a9edc1 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
@@ -182,34 +182,45 @@
             </div>
             <div class="layui-row">
                 <div class="layui-col-xs1">
-                    <label class="layui-form-label-col" style="text-align:right;">抽驗PASS數量：</label>
+                    <label class="layui-form-label-col" style="text-align:right;">
+                        工單ECN：
+                    </label>
                 </div>
                 <div class="layui-col-xs2">
-                    <div class="layui-form-item">
-                        <div class="layui-input-block" style="margin-left:auto;">
-                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.PassQty</label>
-                        </div>
-                    </div>
+                    <label class="layui-form-label-col" style="text-align:left;">
+                        @Model.WipECN
+                    </label>
                 </div>
                 <div class="layui-col-xs1">
-                    <label class="layui-form-label-col" style="text-align:right;">不良品數量：</label>
+                    <label class="layui-form-label-col" style="text-align:right;">PLM_ECN：</label>
                 </div>
-                <div class="layui-col-xs2">
-                    <div class="layui-form-item">
-                        <div class="layui-input-block" style="margin-left:auto;">
-                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.FailQty</label>
-                        </div>
-                    </div>
+                <div class="layui-col-xs3">
+                    <input type="text" readonly style="display: initial;width:80%" class="layui-input" asp-for="PLMECN" />
+                    <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>
+                <div class="layui-col-xs1">
+                    <label class="layui-form-label-col" style="text-align:right;">
+                        抽驗PASS數量：
+                        <label style="text-align: left; width: 50px;">
+                            @Model.PassQty
+                        </label>
+                    </label>
                 </div>
                 <div class="layui-col-xs1">
-                    <label class="layui-form-label-col" style="text-align:right;">抽樣結果：</label>
+                    <label class="layui-form-label-col" style="text-align:right;">
+                        不良品數量：
+                        <label style="text-align: left; width: 50px;">
+                            @Model.FailQty
+                        </label>
+                    </label>
                 </div>
                 <div class="layui-col-xs2">
-                    <div class="layui-form-item">
-                        <div class="layui-input-block" style="margin-left:auto;">
-                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.StatusName</label>
-                        </div>
-                    </div>
+                    <label class="layui-form-label-col" style="text-align:right;">
+                        抽樣結果：
+                        <label style="text-align: left; width: 100px;">@Model.StatusName</label>
+                    </label>
                 </div>
             </div>
             <div class="layui-row">
@@ -644,6 +655,22 @@
             });
         }
 
+        // PLM_ECN
+        function GetPLM_ECN() {
+            $.ajax({
+                url: `http://plm935fs01:50786/RMA_GetLocation/QueryLastReleaseECN?item=@Model.ItemNo`,
+                type: "Get",
+                data: {},
+                success: function (result) {
+                    alert(resut.d);
+                    $('#PLMECN').val(result.d);
+                },
+                error: function (result) {
+                    alert(`呼叫API失敗`);
+                }
+            });
+        }
+
         $(document).ready(function () {
             var error = '@Html.ValidationMessage("error")';
             $("#CustomerMedical").attr("disabled", "disabled");
@@ -653,7 +680,6 @@
                      parent.hg.msg(error);
             };
 
-
             let InhouseNo = $("#hInhouseNo").val().trim();
             let SeqID = $("#hSeqID").val().trim();
             let Result = '@Model.StatusName';