1. FQC補上類型

AMESCoreStudio.Web/Controllers/FQCController.cs

@@ -297,6 +297,7 @@ namespace AMESCoreStudio.Web.Controllers
         public async Task<IActionResult> FQC002C()
         {
             await GetQCGroupSelect();
+            GetQCItem_TypeSelect();
             return View();
         }
 
@@ -305,6 +306,7 @@ namespace AMESCoreStudio.Web.Controllers
         public async Task<IActionResult> FQC002UAsync(int id)
         {
             await GetQCGroupSelect();
+            GetQCItem_TypeSelect();
             var result = await _fqcApi.GetQcItem(id);
             return View(result);
         }

AMESCoreStudio.Web/Views/FQC/FQC007.cshtml

@@ -367,25 +367,29 @@
                                     <th lay-data="{field:'groupNameEN', width:100,sort: true}">類別英文</th>
                                     <th lay-data="{field:'itemNameCN', width:100,sort: true}">項目中文</th>
                                     <th lay-data="{field:'itemNameEN', width:100,sort: true}">項目英文</th>
+                                    <th lay-data="{field:'itemTypeName', width:100,sort: true}">類型</th>
                                 </tr>
                             </thead>
                             <tbody>
                                 @foreach (var index in Model.qcItemDtos)
                                 {
-                                    <tr>
-                                        <td>
-                                            @index.GroupNameCN
-                                        </td>
-                                        <td>
-                                            @index.GroupNameEN
-                                        </td>
-                                        <td>
-                                            @index.ItemNameCN
-                                        </td>
-                                        <td>
-                                            @index.ItemNameEN
-                                        </td>
-                                    </tr>
+                                <tr>
+                                    <td>
+                                        @index.GroupNameCN
+                                    </td>
+                                    <td>
+                                        @index.GroupNameEN
+                                    </td>
+                                    <td>
+                                        @index.ItemNameCN
+                                    </td>
+                                    <td>
+                                        @index.ItemNameEN
+                                    </td>
+                                    <td>
+                                        @index.ItemTypeName
+                                    </td>
+                                </tr>
                                 }
                             </tbody>
                         </table>

AMESCoreStudio.Web/Views/FQC/FQC007A.cshtml

@@ -127,6 +127,10 @@
                 field: 'itemNameEN',
                 title: '項目英文',
             },
+            {
+                field: 'itemTypeName',
+                title: '類型',
+            },
            ]
         ];
     </script>

AMESCoreStudio.Web/Views/FQC/FQC009.cshtml

@@ -232,6 +232,10 @@
                 field: 'itemNameEN',
                 title: '項目英文',
             },
+            {
+                field: 'itemTypeName',
+                title: '類型',
+            },
            ]
         ];
 

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();
             // 先判斷工單是否有資料

AMESCoreStudio.WebApi/Models/AMES/QcItem.cs

@@ -52,6 +52,15 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [StringLength(100)]
         public string ItemNameEN { get; set; }
 
+        /// <summary>
+        /// 類型
+        /// </summary>
+        [Display(Name = "類型")]
+        [DataMember]
+        [Column("TYPE")]
+        [StringLength(10)]
+        public string Type { get; set; }
+
         /// <summary>
         /// 建立UserID
         /// </summary>