From 503e47d147d2894cfcac3719684ec0c13e026244 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 6 Sep 2022 17:01:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=AA=BF=E6=95=B4=E5=8C=AF=E5=87=BAPDF=20?= =?UTF-8?q?EXCEL=E6=A0=BC=E5=BC=8F=EF=BC=8CFQC007=20=E6=AA=A2=E9=A9=97?= =?UTF-8?q?=E8=AA=BF=E6=95=B4=E6=AC=84=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/FQCController.cs | 30 +- .../wwwroot/Reports/FQC010View.rdlc | 2036 ++++++++++++----- AMESCoreStudio.WebApi/Enums/EnumFQC.cs | 24 + 3 files changed, 1471 insertions(+), 619 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs index 3860b38e..7feab4a6 100644 --- a/AMESCoreStudio.Web/Controllers/FQCController.cs +++ b/AMESCoreStudio.Web/Controllers/FQCController.cs @@ -649,9 +649,9 @@ namespace AMESCoreStudio.Web.Controllers [HttpGet] - public async Task FQC005QueryAsync(int quotID = 0 , string AQLType = "", int QCQty = 0, int page = 0, int limit = 10) + public async Task FQC005QueryAsync(int quotID = 0, string AQLType = "", int QCQty = 0, int page = 0, int limit = 10) { - var result = await _fqcApi.GetQcCriterionQuery(quotID, AQLType, QCQty , page, limit); + var result = await _fqcApi.GetQcCriterionQuery(quotID, AQLType, QCQty, page, limit); if (result.Data.Count() != 0) { @@ -1307,7 +1307,7 @@ namespace AMESCoreStudio.Web.Controllers } return Json(new Table() { count = 0, data = null }); } - #endregion + #endregion #region FQC009 料號對應檢驗工項 @@ -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 - E1589 - ESW-075R - ACC-BAT", + NOTE = FqcQuery.Note, OrderNumber = FqcQuery.WipNo, - QuotDescription = "一般二級水準正常檢驗", + QuotDescription = FqcQuery.QuotDescription, ReMajor = FqcQuery.ReQty.ToString(), Sample = FqcQuery.QcQty.ToString(), - SamplingInspectionPlan = "ANSI/ASQZ 1.4II", - StorageLocation = "9000", + QuotName = FqcQuery.QuotName, + //StorageLocation = "9000", Avalue = "AVALUE", VIP = FqcQuery.CustomerVIP, - WaiveRequisition = FqcQuery.StatusName + WaiveRequisition = FqcQuery.StatusName, + AQLType = FqcQuery.AQLType }; // 抓全部檢驗工項 diff --git a/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc b/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc index d1dbd390..1db2a541 100644 --- a/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc +++ b/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc @@ -4,113 +4,6 @@ - - 1.39177cm - 0.03949cm - 0cm - 28.97711cm - - - - - - 1.96409cm - 0.03451cm - 0cm - 28.94183cm - 1 - - - - - - 2.58586cm - 0.03451cm - 0cm - 28.97711cm - 2 - - - - - - 3.17235cm - 0.03528cm - 0cm - 28.94183cm - 3 - - - - - - 3.75884cm - 0.03528cm - 0cm - 28.94183cm - 4 - - - - - - 4.34533cm - 0.03451cm - 0cm - 28.94183cm - 5 - - - - - - 4.93182cm - 0.03451cm - 0cm - 28.94183cm - 6 - - - - - - 5.51831cm - 0.03451cm - 0cm - 28.94183cm - 7 - - - - - - 2.58586cm - 17.28415cm - 0.58649cm - 0cm - 8 - - - - true true @@ -131,14 +24,34 @@ Textbox1 1.36409cm - 0.03528cm - 0.6cm - 4.81465cm - 9 + 0cm + 0.60324cm + 4.88521cm + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -164,15 +77,36 @@ Textbox1 - 1.99937cm - 0.03528cm - 0.58649cm - 4.81465cm - 10 + 1.96733cm + 0cm + 0.60324cm + 4.88521cm + 1 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -198,15 +132,35 @@ Textbox1 - 2.58586cm - 0.03528cm - 0.58649cm - 4.81465cm - 11 + 2.57057cm + 0.60324cm + 4.88521cm + 2 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -232,15 +186,36 @@ Textbox1 - 3.17235cm - 0.03528cm - 0.58649cm - 4.81465cm - 12 + 3.17381cm + 0cm + 0.60324cm + 4.88521cm + 3 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -266,15 +241,36 @@ Textbox1 - 3.75884cm - 0.03528cm - 0.58649cm - 4.81465cm - 13 + 3.77705cm + 0cm + 0.60324cm + 4.88521cm + 4 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -306,15 +302,36 @@ Textbox1 - 4.34533cm - 0.03528cm - 0.58649cm - 4.81465cm - 14 + 4.38029cm + 0cm + 0.60324cm + 4.88521cm + 5 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -340,15 +357,36 @@ Textbox1 - 4.93182cm - 0.03528cm - 0.58649cm - 4.81465cm - 15 + 4.98353cm + 0cm + 0.61241cm + 4.88521cm + 6 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -374,15 +412,36 @@ Textbox1 - 2.58586cm + 2.57057cm 9.12975cm - 0.58649cm + 0.60324cm 2.20247cm - 16 + 7 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -408,15 +467,36 @@ Textbox1 - 3.17235cm + 3.17381cm 9.12975cm - 0.58649cm + 0.60324cm 2.20247cm - 17 + 8 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -442,15 +522,36 @@ Textbox1 - 3.75884cm + 3.77705cm 9.12975cm - 0.58649cm + 0.60324cm 2.20247cm - 18 + 9 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -476,15 +577,36 @@ Textbox1 - 4.34533cm + 4.38029cm 9.12975cm - 0.58649cm + 0.60324cm 2.20247cm - 19 + 10 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -510,15 +632,36 @@ Textbox1 - 4.93182cm + 4.98353cm 9.12975cm - 0.58649cm + 0.61241cm 2.20247cm - 20 + 11 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -544,15 +687,36 @@ Textbox1 - 2.58586cm + 2.57057cm 14.14708cm - 0.58649cm - 3.13707cm - 21 + 0.60324cm + 3.09465cm + 12 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -578,15 +742,36 @@ Textbox1 - 4.34533cm + 4.38029cm 14.14708cm - 0.58649cm + 0.60324cm 2.32739cm - 22 + 13 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -612,15 +797,36 @@ Textbox1 - 4.94533cm + 4.98353cm 14.14708cm - 0.5377cm + 0.61241cm 2.32739cm - 23 + 14 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -646,15 +852,36 @@ Textbox1 - 3.17235cm - 20.34569cm - 0.58649cm - 4.65057cm - 24 + 3.17381cm + 20.35627cm + 0.60324cm + 4.63999cm + 15 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -680,15 +907,36 @@ Textbox1 - 3.75884cm - 20.34569cm - 0.58649cm - 4.65057cm - 25 + 3.77705cm + 20.35627cm + 0.60324cm + 4.63999cm + 16 + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -714,15 +962,36 @@ Textbox1 - 4.34533cm + 4.38029cm 18.96702cm - 0.58649cm + 0.60324cm 2.57289cm - 26 + 17 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -746,24 +1015,35 @@ QuotDescription - 4.34533cm - 4.84993cm - 0.58649cm - 4.27982cm - 27 + 4.38029cm + 4.88521cm + 0.60324cm + 4.24454cm + 18 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -773,51 +1053,6 @@ - - 0.6cm - 0cm - 28.20386cm - - - - - - 1.77826cm - 0.06176cm - 0cm - 28.1774cm - 1 - - - - - - 2.94298cm - 0cm - 28.23916cm - 2 - - - - - - 3.54298cm - 0.02647cm - 0cm - 28.21269cm - 3 - - - - true true @@ -836,18 +1071,32 @@ Textbox33 0.6cm - 0.06176cm - 1.17826cm - 5.57387cm - 4 + 1.14298cm + 5.63563cm + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Middle 2pt @@ -874,18 +1123,33 @@ Textbox33 1.74298cm - 0.06176cm 0.6cm - 5.57387cm - 5 + 5.63563cm + 1 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt 2pt 2pt @@ -911,18 +1175,33 @@ Textbox33 2.34298cm - 0.06176cm 0.6cm - 5.57387cm - 6 + 5.63563cm + 2 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt 2pt 2pt @@ -948,18 +1227,33 @@ Textbox33 2.94298cm - 0.06176cm 0.6cm - 5.57387cm - 7 + 5.63563cm + 3 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt 2pt 2pt @@ -985,18 +1279,33 @@ Textbox33 3.54298cm - 0.06176cm 0.6cm - 5.57387cm - 8 + 5.63563cm + 4 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt 2pt 2pt @@ -1004,18 +1313,6 @@ 2pt - - 2.34298cm - 0.01324cm - 0cm - 28.22592cm - 9 - - - - true true @@ -1033,18 +1330,33 @@ Textbox32 - 0.06176cm 0.6cm - 5.57387cm - 10 + 5.63563cm + 5 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt 2pt 2pt @@ -1069,14 +1381,35 @@ DefectDescription - 5.6577cm + 5.63563cm 0.6cm - 22.58146cm - 11 + 22.65202cm + 6 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -1103,15 +1436,33 @@ 0.6cm 5.63563cm 1.14298cm - 22.61674cm - 12 + 22.65202cm + 7 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + Black + 0.5pt + + Black + + 0.5pt + 2pt 2pt 2pt @@ -1134,15 +1485,36 @@ + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -1169,12 +1541,33 @@ 2.34298cm 5.63563cm 0.6cm - 22.58146cm - 14 + 22.65202cm + 9 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -1201,12 +1594,33 @@ 2.94298cm 5.63563cm 0.6cm - 22.58146cm - 15 + 22.65202cm + 10 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -1233,12 +1647,33 @@ 3.54298cm 5.63563cm 0.6cm - 22.58146cm - 16 + 22.65202cm + 11 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -1250,25 +1685,46 @@ 5.99931cm 0.33438cm 4.14298cm - 28.25237cm - 28 + 28.28765cm + 19 + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + - 2.5cm + 3.73062cm - 2.5cm + 3.73062cm - 2.5cm + 3.73062cm @@ -1494,8 +1950,8 @@ 10.54257cm 0.36085cm 1.2cm - 7.5cm - 29 + 11.19186cm + 20 @@ -1506,16 +1962,16 @@ - 3.99547cm + 4.46512cm - 4.4096cm + 4.87925cm - 2.78679cm + 3.25644cm - 3.53533cm + 4.00498cm @@ -1963,10 +2419,10 @@ DataSet3 12.15422cm - 0.33438cm + 0.36085cm 1.2cm - 14.72719cm - 30 + 16.60579cm + 21 @@ -1977,8 +2433,8 @@ 13.79519cm 0.03451cm 0cm - 28.94183cm - 31 + 28.98209cm + 22 @@ -1987,46 +2443,14 @@ - - 2.69365cm - 0.75145cm - 0cm - - - - - - 5.78262cm - 0.75145cm - 0cm - 1 - - - - - - 8.64012cm - 0.75145cm - 0cm - 2 - - - - - + true true - =First(Fields!Approved.Value, "DataSet1") + Inspector： - Approved - 2.69366cm - 0.75145cm - 3.08896cm - 3 + Textbox76 + 6.35571cm + 1.00557cm + 3.1143cm + + 0.5pt + Middle 2pt 2pt 2pt 2pt - + true true - =First(Fields!Inspector.Value, "DataSet1") + Approved： - Inspector - 8.67326cm - 0.75145cm - 2.80888cm - 4 + Textbox76 + 1.00557cm + 3.15667cm + 1 + + 0.5pt + Middle 2pt 2pt 2pt 2pt - + true true - Inspector： + =First(Fields!Inspector.Value, "DataSet1") - Textbox76 - 5.72754cm - 0.75145cm - 2.83989cm - 5 + Inspector + 3.15667cm + 1.00557cm + 3.19904cm + 2 + + 0.5pt + Middle 2pt 2pt 2pt 2pt - + true true - Approved： + =First(Fields!Approved.Value, "DataSet1") - Textbox76 - 0.01575cm - 0.75145cm - 2.6779cm - 6 + Approved + 9.47001cm + 1.00557cm + 3.15667cm + 3 + + 0.5pt + Middle 2pt 2pt 2pt @@ -2158,14 +2588,34 @@ true 14.11881cm - 7.68722cm - 0.75145cm - 11.53011cm - 32 + 7.72959cm + 1.00557cm + 12.62668cm + 23 + + Black + + 1pt + + + Black + + 1pt + + + Black + + 1pt + + + Black + + 1pt + @@ -2173,7 +2623,7 @@ 16.96665cm 0cm 0cm - 33 + 24 @@ -2199,45 +2649,42 @@ Textbox1 - 4.34533cm + 4.38029cm 24.04223cm - 0.58649cm + 0.60324cm 2.46705cm - 34 + 25 + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt 2pt - - 1.39177cm - 20.35627cm - 0.57232cm - 0cm - 35 - - - - - - 1.3776cm - 24.99626cm - 0.58649cm - 0cm - 36 - - - - true true @@ -2255,15 +2702,36 @@ Textbox1 - 1.39177cm + 1.36409cm 20.35627cm - 0.5441cm + 0.60324cm 4.63999cm - 37 + 26 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -2289,15 +2757,36 @@ Textbox1 - 2.58586cm - 20.34569cm - 0.58649cm - 4.65057cm - 38 + 2.57057cm + 20.35627cm + 0.60324cm + 4.63999cm + 27 + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -2342,7 +2831,7 @@ 9.05441cm 1.24355cm 9.71299cm - 39 + 28 @@ -2373,11 +2862,11 @@ Textbox45 - 0.69991cm + 0.5147cm 21.37842cm 0.61419cm 2.4633cm - 40 + 29 @@ -2408,15 +2897,36 @@ Textbox45 - 0.69991cm - 26.09873cm + 0.5147cm + 26.7588cm 0.61419cm 1.81031cm - 41 + 30 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -2440,15 +2950,36 @@ AC - 4.34533cm + 4.38029cm 21.5399cm - 0.58649cm + 0.60324cm 2.50233cm - 42 + 31 + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -2472,15 +3003,17 @@ StorageLocation - 3.75884cm + 3.77705cm 24.99626cm - 0.58649cm - 3.98008cm - 43 + 0.60324cm + 4.02034cm + 32 + + 0.5pt + Middle 2pt 2pt 2pt @@ -2504,15 +3037,17 @@ VIP - 2.59937cm + 2.57057cm 24.99626cm - 0.58649cm - 3.98008cm - 44 + 0.60324cm + 4.02034cm + 33 + + 0.5pt + Middle 2pt 2pt 2pt @@ -2536,20 +3071,17 @@ ECN - 3.17235cm + 3.17381cm 24.99626cm - 0.58649cm - 3.98008cm - 45 + 0.60324cm + 4.02034cm + 34 - - - Black - 1pt - + 0.5pt + + Middle 2pt 2pt 2pt @@ -2573,15 +3105,17 @@ InspectionDate - 1.39177cm + 1.36409cm 24.99626cm - 0.53704cm - 3.98008cm - 46 + 0.60324cm + 4.02034cm + 35 + + 0.5pt + Middle 2pt 2pt 2pt @@ -2606,23 +3140,34 @@ InspectionNumber 1.36409cm - 4.84993cm - 0.6cm - 4.27982cm - 47 + 4.88521cm + 0.60324cm + 4.24454cm + 36 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -2647,24 +3192,35 @@ Model - 1.98586cm - 4.84993cm - 0.6cm - 4.27982cm - 48 + 1.96733cm + 4.88521cm + 0.60324cm + 4.24454cm + 37 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -2687,15 +3243,17 @@ ModelName - 1.92881cm - 9.14775cm - 0.6cm - 19.84659cm - 49 + 1.96733cm + 9.12975cm + 0.60324cm + 19.88685cm + 38 + + 0.5pt + Middle 2pt 2pt 2pt @@ -2719,24 +3277,35 @@ OrderNumber - 2.59937cm - 4.84993cm - 0.55121cm - 4.27982cm - 50 + 2.57057cm + 4.88521cm + 0.60324cm + 4.24454cm + 39 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -2761,24 +3330,35 @@ InspectionType - 3.17235cm - 4.84993cm - 0.6cm - 4.27982cm - 51 + 3.17381cm + 4.88521cm + 0.60324cm + 4.24454cm + 40 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -2803,24 +3383,35 @@ QuotName - 3.77235cm - 4.84993cm - 0.57298cm - 4.27982cm - 52 + 3.77705cm + 4.88521cm + 0.60324cm + 4.24454cm + 41 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -2845,24 +3436,35 @@ Judgment - 4.93182cm - 4.84993cm - 0.55121cm - 4.27982cm - 53 + 4.98353cm + 4.88521cm + 0.61241cm + 4.24454cm + 42 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -2887,15 +3489,36 @@ ReMajor - 4.34533cm + 4.38029cm 26.50929cm - 0.58649cm - 2.46705cm - 54 + 0.60324cm + 2.50731cm + 43 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -2919,24 +3542,35 @@ LotSize - 2.58586cm + 2.57057cm 11.33222cm - 0.58649cm + 0.60324cm 2.81486cm - 55 + 44 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -2961,24 +3595,35 @@ BIOSVer - 3.17235cm + 3.17381cm 11.33222cm - 0.58649cm - 9.01347cm - 56 + 0.60324cm + 9.02405cm + 45 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -3003,24 +3648,35 @@ Factory - 3.77235cm + 3.77705cm 11.33222cm - 0.57298cm + 0.60324cm 2.81486cm - 57 + 46 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -3045,24 +3701,35 @@ AQL - 4.34533cm + 4.38029cm 11.33222cm - 0.58649cm + 0.60324cm 2.81486cm - 58 + 47 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -3087,24 +3754,35 @@ Major - 4.93182cm + 4.98353cm 11.33222cm - 0.6cm + 0.61241cm 2.81486cm - 59 + 48 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -3129,15 +3807,36 @@ MedicalModel - 2.56409cm - 17.28415cm - 0.60826cm - 3.06154cm - 60 + 2.57057cm + 17.24173cm + 0.60324cm + 3.11454cm + 49 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -3159,21 +3858,36 @@ FactoryRemark - 3.77235cm + 3.77705cm 14.14708cm - 0.57298cm - 6.19861cm - 61 + 0.60324cm + 6.20919cm + 50 + 0.5pt + + Black + + 0.5pt + - + Black + + 0.5pt - + Black + + 0.5pt + + Black + + 0.5pt + 2pt 2pt 2pt @@ -3197,24 +3911,35 @@ Sample - 4.34533cm + 4.38029cm 16.47447cm - 0.58649cm + 0.60324cm 2.49255cm - 62 + 51 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -3239,24 +3964,35 @@ Minor - 4.93182cm + 4.98353cm 16.47447cm - 0.58649cm + 0.61241cm 2.49255cm - 63 + 52 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -3282,24 +4018,35 @@ - 4.93182cm + 4.98353cm 18.96702cm - 0.58649cm + 0.61241cm 2.57289cm - 64 + 53 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt Black - 1pt + 0.5pt 2pt 2pt @@ -3321,15 +4068,36 @@ + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -3354,14 +4122,35 @@ InspectionStatus 1.36409cm - 9.14775cm - 0.6cm - 11.19794cm - 66 + 9.12975cm + 0.60324cm + 11.22652cm + 55 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + 2pt 2pt 2pt @@ -3387,19 +4176,35 @@ Textbox1 - 4.94533cm + 4.98353cm 21.5399cm - 0.58649cm + 0.61241cm 2.50233cm - 67 + 56 + + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + Black - 1pt + 0.5pt 2pt 2pt @@ -3415,7 +4220,7 @@ 1.82443cm 1.14483cm 5.40124cm - 68 + 57 @@ -3426,12 +4231,33 @@ true 0.34078cm 0.30627cm - 16.73653cm + 16.29076cm 29.0166cm + 0.5pt + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + diff --git a/AMESCoreStudio.WebApi/Enums/EnumFQC.cs b/AMESCoreStudio.WebApi/Enums/EnumFQC.cs index f2a7abeb..562c33f8 100644 --- a/AMESCoreStudio.WebApi/Enums/EnumFQC.cs +++ b/AMESCoreStudio.WebApi/Enums/EnumFQC.cs @@ -69,6 +69,30 @@ namespace AMESCoreStudio.WebApi.Enum B = 2 } + /// + /// 檢驗地點 + /// + public enum EnumInspection_Status + { + /// + /// 廠驗 + /// + [Display(Name = "廠驗")] + A = 1, + + /// + /// 委外 + /// + [Display(Name = "委外")] + B = 2, + + /// + /// 免驗 + /// + [Display(Name = "免驗")] + C = 3, + } + /// /// Get Enum Display ///