diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs
index 980f13ac..9fe38506 100644
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@@ -1350,6 +1350,31 @@ namespace AMESCoreStudio.Web.Controllers
ItemID = "2",
ItemName = "BB",
ItemType = "Major"
+ },
+ new FQC010Detail1{
+ ItemID = "2",
+ ItemName = "BB",
+ ItemType = "Major"
+ },
+ new FQC010Detail1{
+ ItemID = "2",
+ ItemName = "BB",
+ ItemType = "Major"
+ },
+ new FQC010Detail1{
+ ItemID = "2",
+ ItemName = "BB",
+ ItemType = "Major"
+ },
+ new FQC010Detail1{
+ ItemID = "2",
+ ItemName = "BB",
+ ItemType = "Major"
+ },
+ new FQC010Detail1{
+ ItemID = "2",
+ ItemName = "BB",
+ ItemType = "Major"
},
new FQC010Detail1{
ItemID = "2",
diff --git a/AMESCoreStudio.Web/wwwroot/Reports/View.rdlc b/AMESCoreStudio.Web/wwwroot/Reports/View.rdlc
index 4b29cda9..3f839e54 100644
--- a/AMESCoreStudio.Web/wwwroot/Reports/View.rdlc
+++ b/AMESCoreStudio.Web/wwwroot/Reports/View.rdlc
@@ -5,9 +5,10 @@
- 1.03188cm
+ 1.39177cm
+ 0.03949cm
0cm
- 28.14731cm
+ 28.97711cm
@@ -15,9 +16,10 @@
- 1.82298cm
+ 1.96409cm
+ 0.03451cm
0cm
- 28.14731cm
+ 28.94183cm
1
- 2.69081cm
+ 2.58586cm
+ 0.03451cm
0cm
- 28.14731cm
+ 28.97711cm
2
- 3.5216cm
+ 3.17235cm
+ 0.03528cm
0cm
- 28.14731cm
+ 28.94183cm
3
- 4.37885cm
+ 3.75884cm
+ 0.03528cm
0cm
- 28.14731cm
+ 28.94183cm
4
- 5.27844cm
+ 4.34533cm
+ 0.03451cm
0cm
- 28.14731cm
+ 28.94183cm
5
- 6.1251cm
+ 4.93182cm
+ 0.03451cm
0cm
- 28.14731cm
+ 28.94183cm
6
- 7.03081cm
- 0.00077cm
+ 5.51831cm
+ 0.03451cm
0cm
- 28.14731cm
+ 28.94183cm
7
-
- 1.03188cm
- 3.86292cm
- 5.98804cm
- 0cm
- 8
-
-
-
-
-
- 1.03187cm
- 8.88357cm
- 5.99894cm
- 0cm
- 9
-
-
-
-
-
- 2.69081cm
- 10.98021cm
- 4.3291cm
- 0cm
- 10
-
-
-
-
-
- 2.69081cm
- 14.12875cm
- 0.83079cm
- 0cm
- 11
-
-
-
-
- 2.66868cm
- 16.93214cm
- 0.85292cm
+ 2.58586cm
+ 17.28415cm
+ 0.58649cm
0cm
- 12
+ 8
@@ -153,11 +112,11 @@
- 2.66868cm
- 18.97062cm
- 4.35122cm
+ 2.58586cm
+ 20.35627cm
+ 2.93245cm
0cm
- 13
+ 9
@@ -165,11 +124,11 @@
- 2.66868cm
- 22.53721cm
- 3.45642cm
+ 2.58586cm
+ 24.99626cm
+ 2.93245cm
0cm
- 14
+ 10
@@ -184,7 +143,9 @@
Inspection number:
-
+
@@ -216,7 +177,9 @@
Model Name:
-
+
@@ -248,7 +211,9 @@
Order number:
-
+
@@ -280,7 +245,9 @@
Inspection Type:
-
+
@@ -312,7 +279,9 @@
sampling inspection plan:
-
+
@@ -344,7 +313,9 @@
成品99:
-
+
@@ -376,7 +347,9 @@
Judgment:
-
+
@@ -408,7 +381,9 @@
Lot Size:
-
+
@@ -440,7 +415,9 @@
BIOS Ver:
-
+
@@ -472,7 +449,9 @@
Factory:
-
+
@@ -504,7 +483,9 @@
AQL:
-
+
@@ -536,7 +517,9 @@
Major:
-
+
@@ -568,7 +551,9 @@
Medical model:
-
+
@@ -600,7 +585,9 @@
Sample:
-
+
@@ -632,39 +619,9 @@
Minor:
-
-
-
-
-
-
- Textbox1
- 6.26793cm
- 14.32503cm
- 0.58649cm
- 2.74901cm
- 29
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-
-
- true
- true
-
-
-
-
- VIP?:
-
+
@@ -696,7 +653,9 @@
ECN:
-
+
@@ -728,7 +687,9 @@
Storage Location:
-
+
@@ -760,7 +721,9 @@
AC:
-
+
@@ -792,22 +755,34 @@
=First(Fields!Product99.Value, "DataSet1")
-
+
Product99
- 5.3906cm
- 4.03931cm
- 0.6cm
- 2.5cm
- 34
+ 4.34533cm
+ 4.84993cm
+ 0.58649cm
+ 4.27982cm
+ 29
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
2pt
2pt
2pt
@@ -817,9 +792,9 @@
- 0.87312cm
+ 0.6cm
0cm
- 25.74323cm
+ 28.20386cm
@@ -828,9 +803,9 @@
1.77826cm
- 0.02646cm
+ 0.06176cm
0cm
- 25.74323cm
+ 28.1774cm
1
- 3.60668cm
- 0.01324cm
+ 2.94298cm
0cm
- 25.74323cm
+ 28.23916cm
2
- 4.56145cm
- 0.01324cm
+ 3.54298cm
+ 0.02647cm
0cm
- 25.74323cm
+ 28.21269cm
3
-
- 5.00063cm
- 5.53635cm
- 0cm
- 4
-
-
-
-
true
true
@@ -890,15 +853,21 @@
Textbox33
- 1.00187cm
- 0.02647cm
- 0.6cm
- 4.90361cm
- 5
+ 0.6cm
+ 0.06176cm
+ 1.17826cm
+ 5.57387cm
+ 4
+
+ Black
+
+ 1pt
+
+ Middle
2pt
2pt
2pt
@@ -922,15 +891,20 @@
Textbox33
- 1.92365cm
- 0.02647cm
+ 1.74298cm
+ 0.06176cm
0.6cm
- 4.90361cm
- 6
+ 5.57387cm
+ 5
+
+ Black
+
+ 1pt
+
2pt
2pt
2pt
@@ -954,15 +928,20 @@
Textbox33
- 2.82315cm
- 0.02647cm
+ 2.34298cm
+ 0.06176cm
0.6cm
- 4.90361cm
- 7
+ 5.57387cm
+ 6
+
+ Black
+
+ 1pt
+
2pt
2pt
2pt
@@ -986,15 +965,20 @@
Textbox33
- 3.75693cm
- 0.06175cm
+ 2.94298cm
+ 0.06176cm
0.6cm
- 4.93889cm
- 8
+ 5.57387cm
+ 7
+
+ Black
+
+ 1pt
+
2pt
2pt
2pt
@@ -1018,15 +1002,20 @@
Textbox33
- 4.74697cm
- 0.02647cm
+ 3.54298cm
+ 0.06176cm
0.6cm
- 4.90361cm
- 9
+ 5.57387cm
+ 8
+
+ Black
+
+ 1pt
+
2pt
2pt
2pt
@@ -1034,62 +1023,260 @@
- 2.6882cm
+ 2.34298cm
0.01324cm
0cm
- 25.74323cm
- 10
+ 28.22592cm
+ 9
-
- true
- 7.30635cm
- 0.23812cm
- 5.53635cm
- 25.76969cm
- 35
-
-
-
-
-
- true
- true
-
-
-
-
- Defect Description:
-
-
-
+
+ true
+ true
+
+
+
+
+ Defect Description:
+
+
+
+
+
+
+ Textbox32
+ 0.06176cm
+ 0.6cm
+ 5.57387cm
+ 10
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
-
-
- Textbox32
- 7.38047cm
- 0.26459cm
- 0.6cm
- 4.90361cm
- 36
-
-
- 2pt
- 2pt
- 2pt
- 2pt
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!DefectDescription.Value, "DataSet1")
+
+
+
+
+
+
+ DefectDescription
+ 5.6577cm
+ 0.6cm
+ 22.58146cm
+ 11
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!NOTE.Value, "DataSet1")
+
+
+
+
+
+
+ NOTE
+ 0.6cm
+ 5.63563cm
+ 1.14298cm
+ 22.61674cm
+ 12
+
+
+
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!FactoryRemark.Value, "DataSet1")
+
+
+
+
+
+
+ FactoryRemark1
+ 1.77826cm
+ 5.63563cm
+ 0.56472cm
+ 22.58146cm
+ 13
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!ECNMemo.Value, "DataSet1")
+
+
+
+
+
+
+ ECNMemo
+ 2.34298cm
+ 5.63563cm
+ 0.6cm
+ 22.58146cm
+ 14
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!InspectionInstrumentNumber.Value, "DataSet1")
+
+
+
+
+
+
+ InspectionInstrumentNumber
+ 2.94298cm
+ 5.63563cm
+ 0.6cm
+ 22.58146cm
+ 15
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!InspectionItems.Value, "DataSet1")
+
+
+
+
+
+
+ InspectionItems
+ 3.54298cm
+ 5.63563cm
+ 0.6cm
+ 22.58146cm
+ 16
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ 6.7666cm
+ 0.36788cm
+ 4.14298cm
+ 28.25237cm
+ 30
+
+
-
+
@@ -1326,11 +1513,11 @@
DataSet2
- 13.02965cm
- 0.29987cm
+ 11.2834cm
+ 0.33438cm
1.2cm
7.5cm
- 37
+ 31
@@ -1641,11 +1828,11 @@
DataSet3
- 14.66776cm
- 0.29987cm
+ 12.92151cm
+ 0.33438cm
1.2cm
14.72719cm
- 38
+ 32
@@ -1653,11 +1840,11 @@
- 16.17566cm
- 0.00077cm
+ 15.40915cm
+ 0.03451cm
0cm
- 28.14731cm
- 39
+ 28.9426cm
+ 33
@@ -1706,7 +1893,10 @@
=First(Fields!Approved.Value, "DataSet1")
-
+
-
- 4.37885cm
- 14.12875cm
- 2.64106cm
+
+ 5.59594cm
+ 16.96665cm
+ 0cm
0cm
- 41
+ 35
-
- 5.27844cm
- 16.93214cm
- 1.75237cm
+
+ 6.22107cm
+ 0.03451cm
+ 0cm
+ 28.97634cm
+ 36
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Re Major:
+
+
+
+
+
+
+ Textbox1
+ 5.51831cm
+ 0.03528cm
+ 0.70276cm
+ 4.81465cm
+ 37
+
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ 1.39177cm
+ 20.35627cm
+ 0.57232cm
0cm
- 42
+ 38
+
+
+
+
+
+ 1.3776cm
+ 24.99626cm
+ 0.58649cm
+ 0cm
+ 39
+
+ true
+ true
+
+
+
+
+ Inspection Date:
+
+
+
+
+
+
+ Textbox1
+ 1.34938cm
+ 20.35627cm
+ 0.58649cm
+ 4.63999cm
+ 40
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ VIP?:
+
+
+
+
+
+
+ Textbox1
+ 2.58586cm
+ 20.34569cm
+ 0.58649cm
+ 4.65057cm
+ 41
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ Aulue-Technology Inc.
+
+
+
+
+
+
+
+
+ FQC Inspection Report
+
+
+
+
+
+
+ Textbox44
+ 0.10583cm
+ 9.05441cm
+ 1.24355cm
+ 9.71299cm
+ 42
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ QQ4-032
+
+
+
+
+
+
+ Textbox45
+ 0.69991cm
+ 21.37842cm
+ 0.61419cm
+ 2.4633cm
+ 43
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ Rev.B5
+
+
+
+
+
+
+ Textbox45
+ 0.69991cm
+ 26.09873cm
+ 0.61419cm
+ 1.81031cm
+ 44
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!AC.Value, "DataSet1")
+
+
+
+
+
+
+ AC
+ 4.34533cm
+ 24.99626cm
+ 0.58649cm
+ 3.98008cm
+ 45
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!StorageLocation.Value, "DataSet1")
+
+
+
+
+
+
+ StorageLocation
+ 3.75884cm
+ 24.99626cm
+ 0.58649cm
+ 3.98008cm
+ 46
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!VIP.Value, "DataSet1")
+
+
+
+
+
+
+ VIP
+ 2.59937cm
+ 24.99626cm
+ 0.58649cm
+ 3.98008cm
+ 47
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!ECN.Value, "DataSet1")
+
+
+
+
+
+
+ ECN
+ 3.17235cm
+ 24.99626cm
+ 0.58649cm
+ 3.98008cm
+ 48
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!InspectionDate.Value, "DataSet1")
+
+
+
+
+
+
+ InspectionDate
+ 1.36409cm
+ 24.99626cm
+ 0.56472cm
+ 3.98008cm
+ 49
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!InspectionNumber.Value, "DataSet1")
+
+
+
+
+
+
+ InspectionNumber
+ 1.36409cm
+ 4.86793cm
+ 0.6cm
+ 4.26182cm
+ 50
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!Model.Value, "DataSet1")
+
+
+
+
+
+
+ Model
+ 1.98586cm
+ 4.84993cm
+ 0.6cm
+ 4.27982cm
+ 51
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!ModelName.Value, "DataSet1")
+
+
+
+
+
+
+ ModelName
+ 1.92881cm
+ 9.14775cm
+ 0.6cm
+ 19.84659cm
+ 52
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!OrderNumber.Value, "DataSet1")
+
+
+
+
+
+
+ OrderNumber
+ 2.59937cm
+ 4.84993cm
+ 0.55121cm
+ 4.27982cm
+ 53
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!InspectionType.Value, "DataSet1")
+
+
+
+
+
+
+ InspectionType
+ 3.17235cm
+ 4.84993cm
+ 0.6cm
+ 4.27982cm
+ 54
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!SamplingInspectionPlan.Value, "DataSet1")
+
+
+
+
+
+
+ SamplingInspectionPlan
+ 3.77235cm
+ 4.84993cm
+ 0.57298cm
+ 4.27982cm
+ 55
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!Judgment.Value, "DataSet1")
+
+
+
+
+
+
+ Judgment
+ 4.93182cm
+ 4.84993cm
+ 0.55121cm
+ 4.27982cm
+ 56
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!ReMajor.Value, "DataSet1")
+
+
+
+
+
+
+ ReMajor
+ 5.51831cm
+ 4.84993cm
+ 0.66412cm
+ 4.27982cm
+ 57
+
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!LotSize.Value, "DataSet1")
+
+
+
+
+
+
+ LotSize
+ 2.58586cm
+ 11.33222cm
+ 0.58649cm
+ 2.81486cm
+ 58
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!BIOSVer.Value, "DataSet1")
+
+
+
+
+
+
+ BIOSVer
+ 3.17235cm
+ 11.33222cm
+ 0.58649cm
+ 9.02405cm
+ 59
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!Factory.Value, "DataSet1")
+
+
+
+
+
+
+ Factory
+ 3.77235cm
+ 11.33222cm
+ 0.57298cm
+ 2.83104cm
+ 60
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!AQL.Value, "DataSet1")
+
+
+
+
+
+
+ AQL
+ 4.34533cm
+ 11.33222cm
+ 0.58649cm
+ 2.83104cm
+ 61
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!Major.Value, "DataSet1")
+
+
+
+
+
+
+ Major
+ 4.93182cm
+ 11.33222cm
+ 0.6cm
+ 2.83104cm
+ 62
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!MedicalModel.Value, "DataSet1")
+
+
+
+
+
+
+ MedicalModel
+ 2.56409cm
+ 17.28415cm
+ 0.60826cm
+ 3.06154cm
+ 63
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!FactoryRemark.Value, "DataSet1")
+
+
+
+
+
+
+ FactoryRemark
+ 3.75884cm
+ 14.16326cm
+ 0.6cm
+ 6.18243cm
+ 64
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!Sample.Value, "DataSet1")
+
+
+
+
+
+
+ Sample
+ 4.34533cm
+ 17.28415cm
+ 0.58649cm
+ 3.06154cm
+ 65
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!Minor.Value, "DataSet1")
+
+
+
+
+
+
+ Minor
+ 4.93182cm
+ 17.28415cm
+ 0.58649cm
+ 3.06154cm
+ 66
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!SpeciallyAdoption.Value, "DataSet1")
+
+
+
+
+
+
+ SpeciallyAdoption
+ 4.93182cm
+ 20.35627cm
+ 0.55121cm
+ 4.65057cm
+ 67
+
+
+
+ Black
+
+ 1pt
+
+
+ Black
+
+ 1pt
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!WaiveRequisition.Value, "DataSet1")
+
+
+
+
+
+
+ WaiveRequisition
+ 4.93182cm
+ 24.99626cm
+ 0.55121cm
+ 3.98008cm
+ 68
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!InspectionStatus.Value, "DataSet1")
+
+
+
+
+
+
+ InspectionStatus
+ 1.36409cm
+ 9.14775cm
+ 0.6cm
+ 11.19794cm
+ 69
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
true
0.34078cm
- 0.34078cm
- 17.23924cm
- 28.68288cm
+ 0.30627cm
+ 16.73653cm
+ 29.0166cm
@@ -1879,7 +3265,7 @@
7.02357in