From 3691327e02940698bd47b26fe5447c79ac2c8a8b Mon Sep 17 00:00:00 2001
From: ray <newkyonew@hotmail.com>
Date: Sun, 21 Aug 2022 11:34:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=20FQC=E6=8A=BD=E9=A9=97=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/FQCController.cs              | 22 +++++++++----------
 AMESCoreStudio.Web/Views/FQC/FQC007.cshtml    |  2 +-
 .../AMES/FqcInhouseMasterController.cs        |  2 +-
 開發文件/QC/Table更新.txt               | 18 ++++++++++++++-
 4 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs
index 47f21d13..6a671f56 100644
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@@ -1366,15 +1366,15 @@ namespace AMESCoreStudio.Web.Controllers
                     InspectionDate = FqcQuery.EndTime,
                     AC = FqcQuery.AcQty.ToString(),
                     Approved = "王曉明",
-                    AQL = "2.5",
+                    //AQL = "2.5",
                     SpeciallyAdoption = FqcQuery.SpecialPo,
                     BIOSVer = FqcQuery.BIOS,
-                    ECN = "22N0202",
-                    ECNMemo = "工單生產已是最新ECN",
+                    //ECN = "22N0202",
+                    //ECNMemo = "工單生產已是最新ECN",
                     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 = "廠驗",
                     InspectionType = FqcQuery.InspectionTypeName,
@@ -1387,16 +1387,16 @@ namespace AMESCoreStudio.Web.Controllers
                     Minor = FqcQuery.MinorQty.ToString(),
                     Model = FqcQuery.ItemNo,
                     ModelName = FqcQuery.ModelNo,
-                    NOTE = @"ACC-M2
-                         E1589
-                         ESW-075R
-                         ACC-BAT",
+                    //NOTE = @"ACC-M2
+                    //     E1589
+                    //     ESW-075R
+                    //     ACC-BAT",
                     OrderNumber = FqcQuery.WipNo,
-                    Product99 = "一般二級水準正常檢驗",
+                    //Product99 = "一般二級水準正常檢驗",
                     ReMajor = FqcQuery.ReQty.ToString(),
                     Sample = FqcQuery.QcQty.ToString(),
-                    SamplingInspectionPlan = "ANSI/ASQZ 1.4II",
-                    StorageLocation = "9000",
+                    //SamplingInspectionPlan = "ANSI/ASQZ 1.4II",
+                    //StorageLocation = "9000",
                     Avalue = "AVALUE",
                     VIP = FqcQuery.CustomerVIP,
                     WaiveRequisition = FqcQuery.StatusName
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
index 82c1af19..99226afc 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
@@ -589,7 +589,7 @@
             let InhouseNo = $("#hInhouseNo").val().trim();
             let SeqID = $("#hSeqID").val().trim();
             let Result = '@Model.StatusName';
-            if (InhouseNo.length != 0 && SeqID.length != 0 && Result == 'A') {
+            if (InhouseNo.length != 0 && SeqID.length != 0 && Result == '') {
                 $("#click").show();
                 }
             setupEnterToNext();
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
index a3e87acc..f16b73ab 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
@@ -242,7 +242,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                        InspectionType = q2.InspectionType,
                                        MajorQty = q2.MajorQty,
                                        MinorQty = q2.MinorQty,
-                                       EndTime = q2.EndTime.ToString()
+                                       EndTime = q2.EndTime.ToString("yyyy/MM/dd")
 
                                    };
 
diff --git a/開發文件/QC/Table更新.txt b/開發文件/QC/Table更新.txt
index 92ece596..099766b8 100644
--- a/開發文件/QC/Table更新.txt
+++ b/開發文件/QC/Table更新.txt
@@ -1,7 +1,7 @@
 QC_ITEM == TYPE 類型
 
 ALTER TABLE QC_ITEM 
-ADD TYPE VARCHAR2(10) );
+ADD TYPE VARCHAR2(10);
 
 COMMENT ON COLUMN QC_ITEM.TYPE   IS '類型';
 
@@ -12,3 +12,19 @@ FQC_RESULT_MASTER == 批退紀錄 Major 數量
 FQC_RESULT_MASTER == 抽樣計畫允收標準 
 
 
+ALTER TABLE FQC_RESULT_MASTER 
+ADD (MAJOR_QTY NUMBER DEFAULT 0 );
+
+ALTER TABLE FQC_RESULT_MASTER 
+ADD (MINOR_QTY NUMBER DEFAULT 0 );
+
+ALTER TABLE FQC_RESULT_MASTER 
+ADD (INSPECTION_TYPE VARCHAR2(20) DEFAULT 'A' NOT NULL);
+
+COMMENT ON COLUMN FQC_RESULT_MASTER.MAJOR_QTY IS '主要';
+
+COMMENT ON COLUMN FQC_RESULT_MASTER.MINOR_QTY IS '次要';
+
+COMMENT ON COLUMN FQC_RESULT_MASTER.INSPECTION_TYPE IS '抽樣允收標準 A:FIRST B:Rework';
+
+