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(); 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 @@ - CASE 編輯 + CASE 編輯 @@ -113,6 +113,7 @@
+ CASE 紀錄
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 };