1. 調整匯出PDF EXCEL格式，FQC007 檢驗調整欄位

AMESCoreStudio.Web/Controllers/FQCController.cs

@@ -1403,6 +1403,10 @@ namespace AMESCoreStudio.Web.Controllers
             if (resultFqcQuery.Data.Count() != 0)
             {
                 var FqcQuery = resultFqcQuery.Data.FirstOrDefault();
+                // Enum 轉換
+                FqcQuery.AQLType = EnumFQC.GetDisplayName((EnumFQC.EnumAQL_Type)Enum.Parse(typeof(EnumFQC.EnumAQL_Type), FqcQuery.AQLType));
+                FqcQuery.InspectionStatus = EnumFQC.GetDisplayName((EnumFQC.EnumInspection_Status)Enum.Parse(typeof(EnumFQC.EnumInspection_Status), FqcQuery.InspectionStatus));
+
                 FQC010Master = new FQC010VIiew()
                 {
                     DefectDescription = FqcQuery.QaMeno,
@@ -1435,7 +1439,7 @@ namespace AMESCoreStudio.Web.Controllers
                     QuotDescription = FqcQuery.QuotDescription,
                     ReMajor = FqcQuery.ReQty.ToString(),
                     Sample = FqcQuery.QcQty.ToString(),
-                    SamplingInspectionPlan = FqcQuery.QuotName,
+                    QuotName = FqcQuery.QuotName,
                     //StorageLocation = "9000",
                     Avalue = "AVALUE",
                     VIP = FqcQuery.CustomerVIP,
@@ -1537,9 +1541,9 @@ namespace AMESCoreStudio.Web.Controllers
                     Factory = FqcQuery.Werk.Split('-')[0],
                     FactoryRemark = FqcQuery.Werk.Split('-')[1],
                     InspectionInstrumentNumber = FqcQuery.OutfitNo,
-                    InspectionItems = "OS:[Win10 IoT]CPU test:[1.10G] RAM test:[4096]",
+                    InspectionItems = $"OS:[{FqcQuery.OS}] CPU test:[{FqcQuery.CPU}] RAM test:[{FqcQuery.RAM}]",
                     InspectionNumber = FqcQuery.InhouseNo,
-                    InspectionStatus = "廠驗",
+                    InspectionStatus = FqcQuery.InspectionStatus,
                     InspectionType = FqcQuery.InspectionTypeName,
                     Inspector = "蔡喬虎",
                     Judgment = "Defect Quantity",
@@ -1550,19 +1554,17 @@ namespace AMESCoreStudio.Web.Controllers
                     Minor = FqcQuery.MinorQty.ToString(),
                     Model = FqcQuery.ItemNo,
                     ModelName = FqcQuery.ModelNo,
-                    NOTE = @"ACC-M2
+                    NOTE = FqcQuery.Note,
-                         E1589
-                         ESW-075R
-                         ACC-BAT",
                     OrderNumber = FqcQuery.WipNo,
-                    QuotDescription = "一般二級水準正常檢驗",
+                    QuotDescription = FqcQuery.QuotDescription,
                     ReMajor = FqcQuery.ReQty.ToString(),
                     Sample = FqcQuery.QcQty.ToString(),
-                    SamplingInspectionPlan = "ANSI/ASQZ 1.4II",
+                    QuotName = FqcQuery.QuotName,
-                    StorageLocation = "9000",
+                    //StorageLocation = "9000",
                     Avalue = "AVALUE",
                     VIP = FqcQuery.CustomerVIP,
-                    WaiveRequisition = FqcQuery.StatusName
+                    WaiveRequisition = FqcQuery.StatusName,
+                    AQLType = FqcQuery.AQLType
                 };
 
                 // 抓全部檢驗工項

AMESCoreStudio.WebApi/Enums/EnumFQC.cs

@@ -69,6 +69,30 @@ namespace AMESCoreStudio.WebApi.Enum
             B = 2
         }
 
+        /// <summary>
+        /// 檢驗地點
+        /// </summary>
+        public enum EnumInspection_Status
+        {
+            /// <summary>
+            /// 廠驗
+            /// </summary>
+            [Display(Name = "廠驗")]
+            A = 1,
+
+            /// <summary>
+            /// 委外
+            /// </summary>
+            [Display(Name = "委外")]
+            B = 2,
+
+            /// <summary>
+            /// 免驗
+            /// </summary>
+            [Display(Name = "免驗")]
+            C = 3,
+        }
+
         /// <summary>
         /// Get Enum Display
         /// </summary>