From ea0d5a7a8b3fbbecb757deca6c3f9dbc7bb8c7d9 Mon Sep 17 00:00:00 2001
From: Yiru <yiru@aten.com.tw>
Date: Mon, 30 Dec 2024 09:31:11 +0800
Subject: [PATCH] =?UTF-8?q?FQC014=20=E4=BA=BA=E5=93=A1=E5=90=8D=E5=89=8D?=
 =?UTF-8?q?=E5=8A=A0=E5=BB=A0=E5=88=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Controllers/FQCController.cs               | 2 +-
 AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml                   | 3 ++-
 AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs
index 27b8be0b..52e365b2 100644
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@@ -2701,7 +2701,7 @@ namespace AMESCoreStudio.Web.Controllers
                 var nginfo = new ResultModel<dynamic>();
                 if (item.Source == "1") //安勤
                 {
-                     nginfo = await _fqcApi.GetNgRepairDataByBarcodeNO(item.BarcodeNoH);
+                     nginfo = await _fqcApi.GetNgRepairDataByBarcodeNO(item.BarcodeNo);
                 }
                 else  // 昶亨
                 {
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml
index 85667db6..99e2f96b 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml
@@ -63,7 +63,7 @@
                         <td><input asp-for="ReasonNo" class="layui-input" style="background-color: #D3D3D3;" readonly="readonly" /></td>
                     </tr>
                 </table>
-                <a>CASE 編輯</a>
+                <a style="font-weight: bold;">CASE 編輯</a>
                 <table class="layui-table">
                     <tr>
                         <td><label asp-for="CreateDate" class="control-label"></label></td>
@@ -113,6 +113,7 @@
                     <input type="submit" value="儲存" class="layui-btn" />
                 </div>
                 <div class="form-group">
+                    <a style="font-weight: bold;">CASE 紀錄</a>
                     <table class="layui-hide" id="test" lay-filter="test"></table>
                 </div>
             </form>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs
index afffe945..3a493dfe 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs
@@ -1648,6 +1648,8 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
                     where q3.BarcodeNo == barcodeNo
                     join q7 in _context.Stationses on q2.StationId equals q7.StationID
                     join q8 in _context.UserInfoes on q1.CreateUserID equals q8.UserID
+                    join q9 in _context.WipInfos on q3.WipID equals q9.WipID
+                    join q5 in _context.FactoryInfos on q9.WerksNO equals q5.FactoryNo
                     select new
                     {
 
@@ -1661,7 +1663,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
                         q1.RepairTypeNo,
                         q1.RepairDesc,
                         q1.PartNo,
-                        q8.UserName
+                        UserName = q5.FactoryNameCh + q8.UserName
                     };