diff --git a/AMESCoreStudio.Web/Controllers/RPTController.cs b/AMESCoreStudio.Web/Controllers/RPTController.cs index 1a2ecf49..31d1b5c9 100644 --- a/AMESCoreStudio.Web/Controllers/RPTController.cs +++ b/AMESCoreStudio.Web/Controllers/RPTController.cs @@ -1717,7 +1717,7 @@ namespace AMESCoreStudio.Web.Controllers /// 西元 /// 月份 /// 類別 - /// 公司類型 + /// 產品別 /// 頁數 /// 筆數 /// diff --git a/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml index c0a6ca03..2367f947 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml @@ -7,27 +7,27 @@ /*.layui-table-main .layui-table-cell {*/ /*height: auto !important;*/ /*white-space: normal; - } + } - .layui-table img { - max-width: 60px; - max-height: 28px; - } + .layui-table img { + max-width: 60px; + max-height: 28px; + } - .layui-tree-main { - cursor: pointer; - padding-right: 10px; - float: left; - border-width: 1px; - border-style: solid; - border-color: #e6e6e6; - margin: 10px 0; - } + .layui-tree-main { + cursor: pointer; + padding-right: 10px; + float: left; + border-width: 1px; + border-style: solid; + border-color: #e6e6e6; + margin: 10px 0; + } - .layui-table-cell { - height: auto; - white-space: normal; - }*/ + .layui-table-cell { + height: auto; + white-space: normal; + }*/ @@ -225,6 +225,10 @@ sort: true, templet: '#statusName' }, + { + field: 'updateUserName', + title: '檢驗者', + }, { field: 'specialNo', title: '特採單號', @@ -250,7 +254,7 @@ } else { aa = '檢視\ - PDF Excel' + PDF Excel' } return aa; } diff --git a/AMESCoreStudio.Web/Views/RPT/RPT003.cshtml b/AMESCoreStudio.Web/Views/RPT/RPT003.cshtml index 7d163643..7bd24d9e 100644 --- a/AMESCoreStudio.Web/Views/RPT/RPT003.cshtml +++ b/AMESCoreStudio.Web/Views/RPT/RPT003.cshtml @@ -35,7 +35,7 @@
- +
diff --git a/AMESCoreStudio.Web/Views/RPT/RPT003U.cshtml b/AMESCoreStudio.Web/Views/RPT/RPT003U.cshtml index 5dcb5474..126c78e7 100644 --- a/AMESCoreStudio.Web/Views/RPT/RPT003U.cshtml +++ b/AMESCoreStudio.Web/Views/RPT/RPT003U.cshtml @@ -41,7 +41,7 @@
- +
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs index acdc740d..c094d359 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs @@ -112,6 +112,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES public async Task> GetFqcInhouseMasterQuery(string barcodeNo, string wipNo, string boxNo , string inhouseNo, string date_str, string date_end, string status, string factoryID, string factoryNo, int page = 0, int limit = 10) { + Helper helper = new Helper(_context); + var q = from q1 in _context.FqcInhouseMasters join q2 in _context.FqcInhouseDetails on new { q1.InhouseNo, q1.SeqID } equals new { q2.InhouseNo, q2.SeqID } into j0 from q2 in j0.DefaultIfEmpty() @@ -137,7 +139,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES CreateDate = q1.CreateDate, EndTime = q3.EndTime, SpecialNo = q3.SpecialPo, - QaMemo = q3.QaMeno + QaMemo = q3.QaMeno, + UpdateUserName = q3.UpdateUserID == 0 ? "" : helper.GetUserNo(q3.UpdateUserID).Result, }; //q1.Status == "P" ? "允收" : q1.Status == "R" ? "批退" : "未驗收完成", //IQueryable q1 = _context.FqcInhouseDetails; @@ -207,7 +210,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES CreateDate = s.CreateDate, EndTime = s.EndTime, SpecialNo = s.SpecialNo, - QaMemo = s.QaMemo + QaMemo = s.QaMemo, + UpdateUserName = s.UpdateUserName }).Distinct().ToListAsync(); // 紀錄筆數 diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/QcRateController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/QcRateController.cs index da6723fa..2a714253 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/QcRateController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/QcRateController.cs @@ -39,7 +39,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// 西元 /// 月份 /// 類別 - /// 公司類型 + /// 產品別 /// 頁數 /// 筆數 /// diff --git a/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs index 4ea5aefa..243ddec2 100644 --- a/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs +++ b/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs @@ -118,6 +118,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES [DataMember] public int CreateUserID { get; set; } = 0; + /// + /// 檢驗人員 + /// + [DataMember] + public string UpdateUserName { get; set; } = ""; + /// /// 建立日期 /// diff --git a/AMESCoreStudio.WebApi/Models/AMES/QcRate.cs b/AMESCoreStudio.WebApi/Models/AMES/QcRate.cs index a3073101..79530120 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/QcRate.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/QcRate.cs @@ -43,7 +43,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES public string QcRateType { get; set; } /// - /// 類型 + /// 產品別 /// [Key] [Column("PRODUCT_TYPE")]