diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs index 0c62c5d6..45c2cc93 100644 --- a/AMESCoreStudio.Web/Controllers/FQCController.cs +++ b/AMESCoreStudio.Web/Controllers/FQCController.cs @@ -297,6 +297,7 @@ namespace AMESCoreStudio.Web.Controllers public async Task FQC002C() { await GetQCGroupSelect(); + GetQCItem_TypeSelect(); return View(); } @@ -305,6 +306,7 @@ namespace AMESCoreStudio.Web.Controllers public async Task FQC002UAsync(int id) { await GetQCGroupSelect(); + GetQCItem_TypeSelect(); var result = await _fqcApi.GetQcItem(id); return View(result); } diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml index a2b3f5d3..4895b2d7 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml @@ -367,25 +367,29 @@ 類別英文 項目中文 項目英文 + 類型 @foreach (var index in Model.qcItemDtos) { - - - @index.GroupNameCN - - - @index.GroupNameEN - - - @index.ItemNameCN - - - @index.ItemNameEN - - + + + @index.GroupNameCN + + + @index.GroupNameEN + + + @index.ItemNameCN + + + @index.ItemNameEN + + + @index.ItemTypeName + + } diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007A.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007A.cshtml index 68cdeac6..4eac03db 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC007A.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC007A.cshtml @@ -127,6 +127,10 @@ field: 'itemNameEN', title: '項目英文', }, + { + field: 'itemTypeName', + title: '類型', + }, ] ]; diff --git a/AMESCoreStudio.Web/Views/FQC/FQC009.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC009.cshtml index 2640f9d9..9f5bb1da 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC009.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC009.cshtml @@ -232,6 +232,10 @@ field: 'itemNameEN', title: '項目英文', }, + { + field: 'itemTypeName', + title: '類型', + }, ] ]; diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs index 1a5cd74f..d8501646 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/QcItemController.cs @@ -87,8 +87,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES CreateDate = s.CreateDate, UpdateUserID = s.UpdateUserID, UpdateDate = s.UpdateDate, - GroupNameCN = s.GetQcGroup.GroupNameCN, - GroupNameEN = s.GetQcGroup.GroupNameEN, + GroupNameCN = s.GetQcGroup.GroupNameCN ?? "", + GroupNameEN = s.GetQcGroup.GroupNameCN ?? "", ItemType = s.Type }).ToListAsync(); // 先判斷工單是否有資料 diff --git a/AMESCoreStudio.WebApi/Models/AMES/QcItem.cs b/AMESCoreStudio.WebApi/Models/AMES/QcItem.cs index 36b17839..ba8e9f52 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/QcItem.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/QcItem.cs @@ -52,6 +52,15 @@ namespace AMESCoreStudio.WebApi.Models.AMES [StringLength(100)] public string ItemNameEN { get; set; } + /// + /// 類型 + /// + [Display(Name = "類型")] + [DataMember] + [Column("TYPE")] + [StringLength(10)] + public string Type { get; set; } + /// /// 建立UserID ///