diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs
index 60cf6a4a..47f21d13 100644
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@@ -1344,46 +1344,46 @@ namespace AMESCoreStudio.Web.Controllers
         #endregion
 
         #region FQC010 報表
-        public async Task<IActionResult> FQC010()
+        public async Task<IActionResult> FQC010_PDF(string inhouseNo, int seqID)
         {
             string mimeType = "";
             int extension = 1;
-            var path = $"{this._env.WebRootPath}\\Reports\\View.rdlc";
+            var path = $"{this._env.WebRootPath}\\Reports\\FQC010View.rdlc";
             LocalReport localReport = new LocalReport(path);
             Dictionary<string, string> param = new Dictionary<string, string>();
             System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
             System.Text.Encoding.GetEncoding(1252);
             var FQC010Master = new FQC010VIiew();
             IResultModel<FqcDto> resultFqcQuery;
-            resultFqcQuery = _fqcApi.GetFqcQuery("QWO0002A1001").InvokeAsync().Result;
+            resultFqcQuery = _fqcApi.GetFqcQuery(inhouseNo, seqID).InvokeAsync().Result;
 
             if (resultFqcQuery.Data.Count() != 0)
             {
                 var FqcQuery = resultFqcQuery.Data.FirstOrDefault();
                 FQC010Master = new FQC010VIiew()
                 {
-                    DefectDescription = "N/A",
-                    InspectionDate = "2022/06/30",
+                    DefectDescription = FqcQuery.QaMeno,
+                    InspectionDate = FqcQuery.EndTime,
                     AC = FqcQuery.AcQty.ToString(),
                     Approved = "王曉明",
                     AQL = "2.5",
-                    SpeciallyAdoption = "特採Specially Adoption",
-                    BIOSVer = "2.04A CS:7672H",
+                    SpeciallyAdoption = FqcQuery.SpecialPo,
+                    BIOSVer = FqcQuery.BIOS,
                     ECN = "22N0202",
                     ECNMemo = "工單生產已是最新ECN",
-                    Factory = "YS00",
-                    FactoryRemark = "N/A",
-                    InspectionInstrumentNumber = "N/A",
+                    Factory = FqcQuery.Werk.Split('-')[0],
+                    FactoryRemark = FqcQuery.Werk.Split('-')[1],
+                    InspectionInstrumentNumber = FqcQuery.OutfitNo,
                     InspectionItems = "OS:[Win10 IoT]CPU test:[1.10G] RAM test:[4096]",
                     InspectionNumber = FqcQuery.InhouseNo,
                     InspectionStatus = "廠驗",
                     InspectionType = FqcQuery.InspectionTypeName,
                     Inspector = "蔡喬虎",
                     Judgment = "Defect Quantity",
-                    Line = "安勤產線",
-                    LotSize = "1",
+                    Line = FqcQuery.InhouseMemo,
+                    LotSize = FqcQuery.InhouseQty.ToString(),
                     Major = FqcQuery.MajorQty.ToString(),
-                    MedicalModel = "N",
+                    MedicalModel = FqcQuery.CustomerMedical,
                     Minor = FqcQuery.MinorQty.ToString(),
                     Model = FqcQuery.ItemNo,
                     ModelName = FqcQuery.ModelNo,
@@ -1399,7 +1399,7 @@ namespace AMESCoreStudio.Web.Controllers
                     StorageLocation = "9000",
                     Avalue = "AVALUE",
                     VIP = FqcQuery.CustomerVIP,
-                    WaiveRequisition = "XX"
+                    WaiveRequisition = FqcQuery.StatusName
                 };
 
                 // 抓全部檢驗工項
@@ -1461,6 +1461,131 @@ namespace AMESCoreStudio.Web.Controllers
 
             var result = localReport.Execute(RenderType.Pdf, extension, param, mimeType);
             return File(result.MainStream, "application/pdf");
+
+            //var result = localReport.Execute(RenderType.Excel, extension, param, mimeType);
+            //return File(result.MainStream, "application/msexcel", "Export.xls");
+        }
+        
+        public async Task<IActionResult> FQC010_Excel(string inhouseNo, int seqID)
+        {
+            string mimeType = "";
+            int extension = 1;
+            var path = $"{this._env.WebRootPath}\\Reports\\FQC010View.rdlc";
+            LocalReport localReport = new LocalReport(path);
+            Dictionary<string, string> param = new Dictionary<string, string>();
+            System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
+            System.Text.Encoding.GetEncoding(1252);
+            var FQC010Master = new FQC010VIiew();
+            IResultModel<FqcDto> resultFqcQuery;
+            resultFqcQuery = _fqcApi.GetFqcQuery(inhouseNo, seqID).InvokeAsync().Result;
+
+            if (resultFqcQuery.Data.Count() != 0)
+            {
+                var FqcQuery = resultFqcQuery.Data.FirstOrDefault();
+                FQC010Master = new FQC010VIiew()
+                {
+                    DefectDescription = FqcQuery.QaMeno,
+                    InspectionDate = FqcQuery.EndTime,
+                    AC = FqcQuery.AcQty.ToString(),
+                    Approved = "王曉明",
+                    AQL = "2.5",
+                    SpeciallyAdoption = FqcQuery.SpecialPo,
+                    BIOSVer = FqcQuery.BIOS,
+                    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]",
+                    InspectionNumber = FqcQuery.InhouseNo,
+                    InspectionStatus = "廠驗",
+                    InspectionType = FqcQuery.InspectionTypeName,
+                    Inspector = "蔡喬虎",
+                    Judgment = "Defect Quantity",
+                    Line = FqcQuery.InhouseMemo,
+                    LotSize = FqcQuery.InhouseQty.ToString(),
+                    Major = FqcQuery.MajorQty.ToString(),
+                    MedicalModel = FqcQuery.CustomerMedical,
+                    Minor = FqcQuery.MinorQty.ToString(),
+                    Model = FqcQuery.ItemNo,
+                    ModelName = FqcQuery.ModelNo,
+                    NOTE = @"ACC-M2
+                         E1589
+                         ESW-075R
+                         ACC-BAT",
+                    OrderNumber = FqcQuery.WipNo,
+                    Product99 = "一般二級水準正常檢驗",
+                    ReMajor = FqcQuery.ReQty.ToString(),
+                    Sample = FqcQuery.QcQty.ToString(),
+                    SamplingInspectionPlan = "ANSI/ASQZ 1.4II",
+                    StorageLocation = "9000",
+                    Avalue = "AVALUE",
+                    VIP = FqcQuery.CustomerVIP,
+                    WaiveRequisition = FqcQuery.StatusName
+                };
+
+                // 抓全部檢驗工項
+                var result_QcItem = await _fqcApi.GetQcItemQuery(0, 0, 0);
+                // 取綁定工單檢驗工項資料
+                var result_WipFQC = await _fqcApi.GetWipFqcItemByWipNo(FqcQuery.WipNo);
+                if (result_WipFQC.Count == 0)
+                {
+                    //工單無設定檢驗工項時 在抓料號綁定檢驗工項
+                    var result_MaterialFQC = await _fqcApi.GetMaterialFqcItemsByitemNo(FqcQuery.ItemNo);
+                    if (result_MaterialFQC.Count != 0)
+                    {
+                        // 檢驗工項
+                        foreach (var item in result_QcItem.Data.Where(w => result_MaterialFQC.Select(s => s.QcItemID).Contains(w.ItemID)).ToList())
+                        {
+                            FQC010Master.Detail1.Add(new FQC010Detail1
+                            {
+                                ItemID = item.ItemID.ToString(),
+                                ItemName = item.ItemNameCN,
+                                ItemType = item.ItemTypeName
+                            });
+                        }
+                    }
+                }
+                else
+                {
+                    // 檢驗工項
+                    foreach (var item in result_QcItem.Data.Where(w => result_WipFQC.Select(s => s.QcItemID).Contains(w.ItemID)).ToList())
+                    {
+                        FQC010Master.Detail1.Add(new FQC010Detail1
+                        {
+                            ItemID = item.ItemID.ToString(),
+                            ItemName = item.ItemNameCN,
+                            ItemType = item.ItemTypeName
+                        });
+                    }
+                }
+
+                // 條碼細項
+                var fqcDetail = await _fqcApi.FQC007InhouseDetails(FqcQuery.InhouseNo, Convert.ToInt32(FqcQuery.SeqID));
+                foreach (var item in fqcDetail.Data)
+                {
+                    FQC010Master.Detail2.Add(new FQC010Detail2
+                    {
+                        ProductionSerialNumber = item.BarcodeNo,
+                        ShippingSerialNumber = item.ExtraBarcodeNo,
+                        IsSample = item.IsSample,
+                        InspectionResults = item.StatusNo
+                    });
+                }
+            }
+
+            var FQC010Masters = new List<FQC010VIiew>();
+            FQC010Masters.Add(FQC010Master);
+
+            localReport.AddDataSource("DataSet1", FQC010Masters);
+            localReport.AddDataSource("DataSet2", FQC010Master.Detail1);
+            localReport.AddDataSource("DataSet3", FQC010Master.Detail2);
+
+            //var result = localReport.Execute(RenderType.Pdf, extension, param, mimeType);
+            //return File(result.MainStream, "application/pdf");
+
+            var result = localReport.Execute(RenderType.Excel, extension, param, mimeType);
+            return File(result.MainStream, "application/msexcel", "Export.xls");
         }
         #endregion
 
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
index aa5435bc..34438fc9 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
@@ -5,8 +5,8 @@
 
 <style type="text/css">
     /*.layui-table-main .layui-table-cell {*/
-        /*height: auto !important;*/
-        /*white-space: normal;
+    /*height: auto !important;*/
+    /*white-space: normal;
     }
 
     .layui-table img {
@@ -50,7 +50,7 @@
                                 <select id="factory" lay-filter="factory" name="factory" asp-items="@ViewBag.FactoryInfoList" class="">
                                     <option value="">全部</option>
                                 </select>
-                                
+
                             </div>
                             <input id="factoryID" type="hidden" name="factoryID" value="" />
                         </div>
@@ -119,9 +119,8 @@
 
 @section Scripts{
     <script type="text/javascript">
-        //var roleId = 0;
-        //var roleName = "";
-        layui.use(['form', 'layer', 'laydate'], function () {
+        layui.use(['form', 'layer', 'laydate', 'table'], function () {
+            var table1 = layui.table;
             form = layui.form;
             laydate = layui.laydate;
             laydate.render({
@@ -147,9 +146,9 @@
                 //hg.msghide("刷新数据！");
                 //table && table.reload();
             });
-        });
 
 
+        });
 
         //监听表单提交事件
         hg.form.onsubmit('querysubmit', function (data) {
@@ -220,9 +219,16 @@
             {
                 title: '操作',
                 align: 'center',
-                width: 80,
+                width: 200,
                 templet: function (d) {
-                    return '<a class="layui-btn layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>'
+                    var aa;
+                    if (d.statusName == '未驗收完成') {
+                        aa = '<a class="layui-btn layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>'
+                    }
+                    else {
+                        aa = '<a class="layui-btn layui-btn-warm layui-icon layui-icon-list layui-btn-xs" lay-event="edit">檢視</a>'
+                    }
+                    return aa + '<a class="layui-btn layui-btn-xs " lay-event="PDF">PDF</a><a class="layui-btn layui-btn-xs " lay-event="Excel">Excel</a>'
                 }
             }
         ]];
@@ -233,9 +239,24 @@
             }
         }
 
+        function PDF(obj) {
+            if (obj.data.inhouseNo) {
+                hg.open('PDF', '/FQC/FQC010_PDF?inhouseNo=' + obj.data.inhouseNo + '&seqID=' + obj.data.seqID, '', '', true);
+            }
+        }
+
+        function Excel(obj) {
+            if (obj.data.inhouseNo) {
+                window.open('/FQC/FQC010_Excel?inhouseNo=' + obj.data.inhouseNo + '&seqID=' + obj.data.seqID);
+                return;
+                //hg.open('Excel', '/FQC/FQC010_Excel?inhouseNo=' + obj.data.inhouseNo + '&seqID=' + obj.data.seqID, '', '', true);
+            }
+        }
+
         //基本数据表格
         var table = hg.table.datatable('query', 'FQC查詢', '/FQC/FQC008Query', {}, tableCols, '', true, 'full-100', ['filter', 'print', 'exports']);
-                                                                                       // var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/GetWipInfo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+
+        // var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/GetWipInfo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
     </script>
 
     <script type="text/html" id="statusName">
@@ -247,5 +268,4 @@
         {{ d.statusName }}
         {{#  } }}
     </script>
-}
 }
\ No newline at end of file
diff --git a/AMESCoreStudio.Web/wwwroot/Reports/View.rdlc b/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc
similarity index 86%
rename from AMESCoreStudio.Web/wwwroot/Reports/View.rdlc
rename to AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc
index 3f839e54..260e8053 100644
--- a/AMESCoreStudio.Web/wwwroot/Reports/View.rdlc
+++ b/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc
@@ -111,30 +111,6 @@
               </Border>
             </Style>
           </Line>
-          <Line Name="Line15">
-            <Top>2.58586cm</Top>
-            <Left>20.35627cm</Left>
-            <Height>2.93245cm</Height>
-            <Width>0cm</Width>
-            <ZIndex>9</ZIndex>
-            <Style>
-              <Border>
-                <Style>Solid</Style>
-              </Border>
-            </Style>
-          </Line>
-          <Line Name="Line16">
-            <Top>2.58586cm</Top>
-            <Left>24.99626cm</Left>
-            <Height>2.93245cm</Height>
-            <Width>0cm</Width>
-            <ZIndex>10</ZIndex>
-            <Style>
-              <Border>
-                <Style>Solid</Style>
-              </Border>
-            </Style>
-          </Line>
           <Textbox Name="Textbox1">
             <CanGrow>true</CanGrow>
             <KeepTogether>true</KeepTogether>
@@ -158,7 +134,7 @@
             <Left>0.03528cm</Left>
             <Height>0.6cm</Height>
             <Width>4.81465cm</Width>
-            <ZIndex>11</ZIndex>
+            <ZIndex>9</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -192,7 +168,7 @@
             <Left>0.03528cm</Left>
             <Height>0.58649cm</Height>
             <Width>4.81465cm</Width>
-            <ZIndex>12</ZIndex>
+            <ZIndex>10</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -226,7 +202,7 @@
             <Left>0.03528cm</Left>
             <Height>0.58649cm</Height>
             <Width>4.81465cm</Width>
-            <ZIndex>13</ZIndex>
+            <ZIndex>11</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -260,7 +236,7 @@
             <Left>0.03528cm</Left>
             <Height>0.58649cm</Height>
             <Width>4.81465cm</Width>
-            <ZIndex>14</ZIndex>
+            <ZIndex>12</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -294,7 +270,7 @@
             <Left>0.03528cm</Left>
             <Height>0.58649cm</Height>
             <Width>4.81465cm</Width>
-            <ZIndex>15</ZIndex>
+            <ZIndex>13</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -328,7 +304,7 @@
             <Left>0.03528cm</Left>
             <Height>0.58649cm</Height>
             <Width>4.81465cm</Width>
-            <ZIndex>16</ZIndex>
+            <ZIndex>14</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -362,7 +338,7 @@
             <Left>0.03528cm</Left>
             <Height>0.58649cm</Height>
             <Width>4.81465cm</Width>
-            <ZIndex>17</ZIndex>
+            <ZIndex>15</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -396,7 +372,7 @@
             <Left>9.12975cm</Left>
             <Height>0.58649cm</Height>
             <Width>2.20247cm</Width>
-            <ZIndex>18</ZIndex>
+            <ZIndex>16</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -430,7 +406,7 @@
             <Left>9.12975cm</Left>
             <Height>0.58649cm</Height>
             <Width>2.20247cm</Width>
-            <ZIndex>19</ZIndex>
+            <ZIndex>17</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -464,7 +440,7 @@
             <Left>9.12975cm</Left>
             <Height>0.58649cm</Height>
             <Width>2.20247cm</Width>
-            <ZIndex>20</ZIndex>
+            <ZIndex>18</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -498,7 +474,7 @@
             <Left>9.12975cm</Left>
             <Height>0.58649cm</Height>
             <Width>2.20247cm</Width>
-            <ZIndex>21</ZIndex>
+            <ZIndex>19</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -532,7 +508,7 @@
             <Left>9.12975cm</Left>
             <Height>0.58649cm</Height>
             <Width>2.20247cm</Width>
-            <ZIndex>22</ZIndex>
+            <ZIndex>20</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -566,7 +542,7 @@
             <Left>14.14708cm</Left>
             <Height>0.58649cm</Height>
             <Width>3.13707cm</Width>
-            <ZIndex>23</ZIndex>
+            <ZIndex>21</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -597,10 +573,10 @@
             </Paragraphs>
             <rd:DefaultName>Textbox1</rd:DefaultName>
             <Top>4.34533cm</Top>
-            <Left>14.16326cm</Left>
+            <Left>14.14708cm</Left>
             <Height>0.58649cm</Height>
-            <Width>3.13707cm</Width>
-            <ZIndex>24</ZIndex>
+            <Width>2.32739cm</Width>
+            <ZIndex>22</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -631,10 +607,10 @@
             </Paragraphs>
             <rd:DefaultName>Textbox1</rd:DefaultName>
             <Top>4.94533cm</Top>
-            <Left>14.16326cm</Left>
+            <Left>14.14708cm</Left>
             <Height>0.5377cm</Height>
-            <Width>3.13707cm</Width>
-            <ZIndex>25</ZIndex>
+            <Width>2.32739cm</Width>
+            <ZIndex>23</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -668,7 +644,7 @@
             <Left>20.34569cm</Left>
             <Height>0.58649cm</Height>
             <Width>4.65057cm</Width>
-            <ZIndex>26</ZIndex>
+            <ZIndex>24</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -702,10 +678,10 @@
             <Left>20.34569cm</Left>
             <Height>0.58649cm</Height>
             <Width>4.65057cm</Width>
-            <ZIndex>27</ZIndex>
+            <ZIndex>25</ZIndex>
             <Style>
               <Border>
-                <Style>None</Style>
+                <Style>Solid</Style>
               </Border>
               <PaddingLeft>2pt</PaddingLeft>
               <PaddingRight>2pt</PaddingRight>
@@ -733,10 +709,10 @@
             </Paragraphs>
             <rd:DefaultName>Textbox1</rd:DefaultName>
             <Top>4.34533cm</Top>
-            <Left>20.34569cm</Left>
+            <Left>18.96702cm</Left>
             <Height>0.58649cm</Height>
-            <Width>4.65057cm</Width>
-            <ZIndex>28</ZIndex>
+            <Width>2.57289cm</Width>
+            <ZIndex>26</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -768,7 +744,7 @@
             <Left>4.84993cm</Left>
             <Height>0.58649cm</Height>
             <Width>4.27982cm</Width>
-            <ZIndex>29</ZIndex>
+            <ZIndex>27</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -1136,14 +1112,14 @@
                   <PaddingBottom>2pt</PaddingBottom>
                 </Style>
               </Textbox>
-              <Textbox Name="FactoryRemark1">
+              <Textbox Name="Line">
                 <CanGrow>true</CanGrow>
                 <KeepTogether>true</KeepTogether>
                 <Paragraphs>
                   <Paragraph>
                     <TextRuns>
                       <TextRun>
-                        <Value>=First(Fields!FactoryRemark.Value, "DataSet1")</Value>
+                        <Value>=First(Fields!Line.Value, "DataSet1")</Value>
                         <Style>
                           <FontFamily>微軟正黑體</FontFamily>
                         </Style>
@@ -1152,7 +1128,6 @@
                     <Style />
                   </Paragraph>
                 </Paragraphs>
-                <rd:DefaultName>FactoryRemark1</rd:DefaultName>
                 <Top>1.77826cm</Top>
                 <Left>5.63563cm</Left>
                 <Height>0.56472cm</Height>
@@ -1266,11 +1241,11 @@
               </Textbox>
             </ReportItems>
             <KeepTogether>true</KeepTogether>
-            <Top>6.7666cm</Top>
-            <Left>0.36788cm</Left>
+            <Top>5.99931cm</Top>
+            <Left>0.33438cm</Left>
             <Height>4.14298cm</Height>
             <Width>28.25237cm</Width>
-            <ZIndex>30</ZIndex>
+            <ZIndex>28</ZIndex>
             <Style>
               <Border>
                 <Style>Solid</Style>
@@ -1315,9 +1290,9 @@
                           <rd:DefaultName>Textbox38</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
+                            <BackgroundColor>LightGreen</BackgroundColor>
                             <PaddingLeft>2pt</PaddingLeft>
                             <PaddingRight>2pt</PaddingRight>
                             <PaddingTop>2pt</PaddingTop>
@@ -1347,9 +1322,9 @@
                           <rd:DefaultName>Textbox40</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
+                            <BackgroundColor>LightGreen</BackgroundColor>
                             <PaddingLeft>2pt</PaddingLeft>
                             <PaddingRight>2pt</PaddingRight>
                             <PaddingTop>2pt</PaddingTop>
@@ -1379,9 +1354,9 @@
                           <rd:DefaultName>Textbox42</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
+                            <BackgroundColor>LightGreen</BackgroundColor>
                             <PaddingLeft>2pt</PaddingLeft>
                             <PaddingRight>2pt</PaddingRight>
                             <PaddingTop>2pt</PaddingTop>
@@ -1416,7 +1391,6 @@
                           <rd:DefaultName>ItemID</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
                             <PaddingLeft>2pt</PaddingLeft>
@@ -1448,7 +1422,6 @@
                           <rd:DefaultName>ItemName</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
                             <PaddingLeft>2pt</PaddingLeft>
@@ -1480,7 +1453,6 @@
                           <rd:DefaultName>ItemType</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
                             <PaddingLeft>2pt</PaddingLeft>
@@ -1513,11 +1485,11 @@
               </TablixMembers>
             </TablixRowHierarchy>
             <DataSetName>DataSet2</DataSetName>
-            <Top>11.2834cm</Top>
-            <Left>0.33438cm</Left>
+            <Top>10.54257cm</Top>
+            <Left>0.36085cm</Left>
             <Height>1.2cm</Height>
             <Width>7.5cm</Width>
-            <ZIndex>31</ZIndex>
+            <ZIndex>29</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -1565,9 +1537,29 @@
                           <rd:DefaultName>Textbox47</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
+                            <TopBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </TopBorder>
+                            <BottomBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </BottomBorder>
+                            <LeftBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </LeftBorder>
+                            <RightBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </RightBorder>
+                            <BackgroundColor>LightGreen</BackgroundColor>
                             <PaddingLeft>2pt</PaddingLeft>
                             <PaddingRight>2pt</PaddingRight>
                             <PaddingTop>2pt</PaddingTop>
@@ -1597,9 +1589,29 @@
                           <rd:DefaultName>Textbox49</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
+                            <TopBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </TopBorder>
+                            <BottomBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </BottomBorder>
+                            <LeftBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </LeftBorder>
+                            <RightBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </RightBorder>
+                            <BackgroundColor>LightGreen</BackgroundColor>
                             <PaddingLeft>2pt</PaddingLeft>
                             <PaddingRight>2pt</PaddingRight>
                             <PaddingTop>2pt</PaddingTop>
@@ -1629,9 +1641,29 @@
                           <rd:DefaultName>Textbox51</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
+                            <TopBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </TopBorder>
+                            <BottomBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </BottomBorder>
+                            <LeftBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </LeftBorder>
+                            <RightBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </RightBorder>
+                            <BackgroundColor>LightGreen</BackgroundColor>
                             <PaddingLeft>2pt</PaddingLeft>
                             <PaddingRight>2pt</PaddingRight>
                             <PaddingTop>2pt</PaddingTop>
@@ -1661,9 +1693,29 @@
                           <rd:DefaultName>Textbox53</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
+                            <TopBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </TopBorder>
+                            <BottomBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </BottomBorder>
+                            <LeftBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </LeftBorder>
+                            <RightBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </RightBorder>
+                            <BackgroundColor>LightGreen</BackgroundColor>
                             <PaddingLeft>2pt</PaddingLeft>
                             <PaddingRight>2pt</PaddingRight>
                             <PaddingTop>2pt</PaddingTop>
@@ -1698,9 +1750,28 @@
                           <rd:DefaultName>ShippingSerialNumber</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
+                            <TopBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </TopBorder>
+                            <BottomBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </BottomBorder>
+                            <LeftBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </LeftBorder>
+                            <RightBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </RightBorder>
                             <PaddingLeft>2pt</PaddingLeft>
                             <PaddingRight>2pt</PaddingRight>
                             <PaddingTop>2pt</PaddingTop>
@@ -1730,9 +1801,28 @@
                           <rd:DefaultName>ProductionSerialNumber</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
+                            <TopBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </TopBorder>
+                            <BottomBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </BottomBorder>
+                            <LeftBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </LeftBorder>
+                            <RightBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </RightBorder>
                             <PaddingLeft>2pt</PaddingLeft>
                             <PaddingRight>2pt</PaddingRight>
                             <PaddingTop>2pt</PaddingTop>
@@ -1762,9 +1852,28 @@
                           <rd:DefaultName>IsSample</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
+                            <TopBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </TopBorder>
+                            <BottomBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </BottomBorder>
+                            <LeftBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </LeftBorder>
+                            <RightBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </RightBorder>
                             <PaddingLeft>2pt</PaddingLeft>
                             <PaddingRight>2pt</PaddingRight>
                             <PaddingTop>2pt</PaddingTop>
@@ -1794,9 +1903,28 @@
                           <rd:DefaultName>InspectionResults</rd:DefaultName>
                           <Style>
                             <Border>
-                              <Color>LightGrey</Color>
                               <Style>Solid</Style>
                             </Border>
+                            <TopBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </TopBorder>
+                            <BottomBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </BottomBorder>
+                            <LeftBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </LeftBorder>
+                            <RightBorder>
+                              <Color>Black</Color>
+                              <Style>Solid</Style>
+                              <Width>1pt</Width>
+                            </RightBorder>
                             <PaddingLeft>2pt</PaddingLeft>
                             <PaddingRight>2pt</PaddingRight>
                             <PaddingTop>2pt</PaddingTop>
@@ -1828,11 +1956,11 @@
               </TablixMembers>
             </TablixRowHierarchy>
             <DataSetName>DataSet3</DataSetName>
-            <Top>12.92151cm</Top>
+            <Top>12.15422cm</Top>
             <Left>0.33438cm</Left>
             <Height>1.2cm</Height>
             <Width>14.72719cm</Width>
-            <ZIndex>32</ZIndex>
+            <ZIndex>30</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -1840,11 +1968,11 @@
             </Style>
           </Tablix>
           <Line Name="Line29">
-            <Top>15.40915cm</Top>
+            <Top>13.79519cm</Top>
             <Left>0.03451cm</Left>
             <Height>0cm</Height>
-            <Width>28.9426cm</Width>
-            <ZIndex>33</ZIndex>
+            <Width>28.94183cm</Width>
+            <ZIndex>31</ZIndex>
             <Style>
               <Border>
                 <Style>Solid</Style>
@@ -1905,10 +2033,9 @@
                   </Paragraph>
                 </Paragraphs>
                 <rd:DefaultName>Approved</rd:DefaultName>
-                <Top>0.05942cm</Top>
-                <Left>2.79949cm</Left>
-                <Height>0.69203cm</Height>
-                <Width>2.84202cm</Width>
+                <Left>2.69366cm</Left>
+                <Height>0.75145cm</Height>
+                <Width>3.08896cm</Width>
                 <ZIndex>3</ZIndex>
                 <Style>
                   <Border>
@@ -1940,9 +2067,8 @@
                   </Paragraph>
                 </Paragraphs>
                 <rd:DefaultName>Inspector</rd:DefaultName>
-                <Top>0.05942cm</Top>
                 <Left>8.67326cm</Left>
-                <Height>0.69203cm</Height>
+                <Height>0.75145cm</Height>
                 <Width>2.80888cm</Width>
                 <ZIndex>4</ZIndex>
                 <Style>
@@ -1975,9 +2101,8 @@
                   </Paragraph>
                 </Paragraphs>
                 <rd:DefaultName>Textbox76</rd:DefaultName>
-                <Top>0.05942cm</Top>
                 <Left>5.72754cm</Left>
-                <Height>0.69203cm</Height>
+                <Height>0.75145cm</Height>
                 <Width>2.83989cm</Width>
                 <ZIndex>5</ZIndex>
                 <Style>
@@ -2010,10 +2135,9 @@
                   </Paragraph>
                 </Paragraphs>
                 <rd:DefaultName>Textbox76</rd:DefaultName>
-                <Top>0.05942cm</Top>
                 <Left>0.01575cm</Left>
-                <Height>0.69203cm</Height>
-                <Width>2.60735cm</Width>
+                <Height>0.75145cm</Height>
+                <Width>2.6779cm</Width>
                 <ZIndex>6</ZIndex>
                 <Style>
                   <Border>
@@ -2027,11 +2151,11 @@
               </Textbox>
             </ReportItems>
             <KeepTogether>true</KeepTogether>
-            <Top>15.70631cm</Top>
+            <Top>14.11881cm</Top>
             <Left>7.68722cm</Left>
             <Height>0.75145cm</Height>
             <Width>11.53011cm</Width>
-            <ZIndex>34</ZIndex>
+            <ZIndex>32</ZIndex>
             <Style>
               <Border>
                 <Style>Solid</Style>
@@ -2043,19 +2167,7 @@
             <Left>16.96665cm</Left>
             <Height>0cm</Height>
             <Width>0cm</Width>
-            <ZIndex>35</ZIndex>
-            <Style>
-              <Border>
-                <Style>Solid</Style>
-              </Border>
-            </Style>
-          </Line>
-          <Line Name="Line24">
-            <Top>6.22107cm</Top>
-            <Left>0.03451cm</Left>
-            <Height>0cm</Height>
-            <Width>28.97634cm</Width>
-            <ZIndex>36</ZIndex>
+            <ZIndex>33</ZIndex>
             <Style>
               <Border>
                 <Style>Solid</Style>
@@ -2081,20 +2193,15 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox1</rd:DefaultName>
-            <Top>5.51831cm</Top>
-            <Left>0.03528cm</Left>
-            <Height>0.70276cm</Height>
-            <Width>4.81465cm</Width>
-            <ZIndex>37</ZIndex>
+            <Top>4.34533cm</Top>
+            <Left>24.04223cm</Left>
+            <Height>0.58649cm</Height>
+            <Width>2.46705cm</Width>
+            <ZIndex>34</ZIndex>
             <Style>
               <Border>
-                <Style>None</Style>
-              </Border>
-              <RightBorder>
-                <Color>Black</Color>
                 <Style>Solid</Style>
-                <Width>1pt</Width>
-              </RightBorder>
+              </Border>
               <PaddingLeft>2pt</PaddingLeft>
               <PaddingRight>2pt</PaddingRight>
               <PaddingTop>2pt</PaddingTop>
@@ -2106,7 +2213,7 @@
             <Left>20.35627cm</Left>
             <Height>0.57232cm</Height>
             <Width>0cm</Width>
-            <ZIndex>38</ZIndex>
+            <ZIndex>35</ZIndex>
             <Style>
               <Border>
                 <Style>Solid</Style>
@@ -2118,7 +2225,7 @@
             <Left>24.99626cm</Left>
             <Height>0.58649cm</Height>
             <Width>0cm</Width>
-            <ZIndex>39</ZIndex>
+            <ZIndex>36</ZIndex>
             <Style>
               <Border>
                 <Style>Solid</Style>
@@ -2142,11 +2249,11 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>Textbox1</rd:DefaultName>
-            <Top>1.34938cm</Top>
+            <Top>1.39177cm</Top>
             <Left>20.35627cm</Left>
-            <Height>0.58649cm</Height>
+            <Height>0.5441cm</Height>
             <Width>4.63999cm</Width>
-            <ZIndex>40</ZIndex>
+            <ZIndex>37</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2180,10 +2287,10 @@
             <Left>20.34569cm</Left>
             <Height>0.58649cm</Height>
             <Width>4.65057cm</Width>
-            <ZIndex>41</ZIndex>
+            <ZIndex>38</ZIndex>
             <Style>
               <Border>
-                <Style>None</Style>
+                <Style>Solid</Style>
               </Border>
               <PaddingLeft>2pt</PaddingLeft>
               <PaddingRight>2pt</PaddingRight>
@@ -2229,7 +2336,7 @@
             <Left>9.05441cm</Left>
             <Height>1.24355cm</Height>
             <Width>9.71299cm</Width>
-            <ZIndex>42</ZIndex>
+            <ZIndex>39</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2264,7 +2371,7 @@
             <Left>21.37842cm</Left>
             <Height>0.61419cm</Height>
             <Width>2.4633cm</Width>
-            <ZIndex>43</ZIndex>
+            <ZIndex>40</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2299,7 +2406,7 @@
             <Left>26.09873cm</Left>
             <Height>0.61419cm</Height>
             <Width>1.81031cm</Width>
-            <ZIndex>44</ZIndex>
+            <ZIndex>41</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2328,13 +2435,13 @@
             </Paragraphs>
             <rd:DefaultName>AC</rd:DefaultName>
             <Top>4.34533cm</Top>
-            <Left>24.99626cm</Left>
+            <Left>21.5399cm</Left>
             <Height>0.58649cm</Height>
-            <Width>3.98008cm</Width>
-            <ZIndex>45</ZIndex>
+            <Width>2.50233cm</Width>
+            <ZIndex>42</ZIndex>
             <Style>
               <Border>
-                <Style>None</Style>
+                <Style>Solid</Style>
               </Border>
               <PaddingLeft>2pt</PaddingLeft>
               <PaddingRight>2pt</PaddingRight>
@@ -2363,7 +2470,7 @@
             <Left>24.99626cm</Left>
             <Height>0.58649cm</Height>
             <Width>3.98008cm</Width>
-            <ZIndex>46</ZIndex>
+            <ZIndex>43</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2395,7 +2502,7 @@
             <Left>24.99626cm</Left>
             <Height>0.58649cm</Height>
             <Width>3.98008cm</Width>
-            <ZIndex>47</ZIndex>
+            <ZIndex>44</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2427,11 +2534,16 @@
             <Left>24.99626cm</Left>
             <Height>0.58649cm</Height>
             <Width>3.98008cm</Width>
-            <ZIndex>48</ZIndex>
+            <ZIndex>45</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
               </Border>
+              <LeftBorder>
+                <Color>Black</Color>
+                <Style>Solid</Style>
+                <Width>1pt</Width>
+              </LeftBorder>
               <PaddingLeft>2pt</PaddingLeft>
               <PaddingRight>2pt</PaddingRight>
               <PaddingTop>2pt</PaddingTop>
@@ -2455,11 +2567,11 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>InspectionDate</rd:DefaultName>
-            <Top>1.36409cm</Top>
+            <Top>1.39177cm</Top>
             <Left>24.99626cm</Left>
-            <Height>0.56472cm</Height>
+            <Height>0.53704cm</Height>
             <Width>3.98008cm</Width>
-            <ZIndex>49</ZIndex>
+            <ZIndex>46</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2488,10 +2600,10 @@
             </Paragraphs>
             <rd:DefaultName>InspectionNumber</rd:DefaultName>
             <Top>1.36409cm</Top>
-            <Left>4.86793cm</Left>
+            <Left>4.84993cm</Left>
             <Height>0.6cm</Height>
-            <Width>4.26182cm</Width>
-            <ZIndex>50</ZIndex>
+            <Width>4.27982cm</Width>
+            <ZIndex>47</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2533,7 +2645,7 @@
             <Left>4.84993cm</Left>
             <Height>0.6cm</Height>
             <Width>4.27982cm</Width>
-            <ZIndex>51</ZIndex>
+            <ZIndex>48</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2573,7 +2685,7 @@
             <Left>9.14775cm</Left>
             <Height>0.6cm</Height>
             <Width>19.84659cm</Width>
-            <ZIndex>52</ZIndex>
+            <ZIndex>49</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2605,7 +2717,7 @@
             <Left>4.84993cm</Left>
             <Height>0.55121cm</Height>
             <Width>4.27982cm</Width>
-            <ZIndex>53</ZIndex>
+            <ZIndex>50</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2647,7 +2759,7 @@
             <Left>4.84993cm</Left>
             <Height>0.6cm</Height>
             <Width>4.27982cm</Width>
-            <ZIndex>54</ZIndex>
+            <ZIndex>51</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2689,7 +2801,7 @@
             <Left>4.84993cm</Left>
             <Height>0.57298cm</Height>
             <Width>4.27982cm</Width>
-            <ZIndex>55</ZIndex>
+            <ZIndex>52</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2731,7 +2843,7 @@
             <Left>4.84993cm</Left>
             <Height>0.55121cm</Height>
             <Width>4.27982cm</Width>
-            <ZIndex>56</ZIndex>
+            <ZIndex>53</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2769,20 +2881,15 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>ReMajor</rd:DefaultName>
-            <Top>5.51831cm</Top>
-            <Left>4.84993cm</Left>
-            <Height>0.66412cm</Height>
-            <Width>4.27982cm</Width>
-            <ZIndex>57</ZIndex>
+            <Top>4.34533cm</Top>
+            <Left>26.50929cm</Left>
+            <Height>0.58649cm</Height>
+            <Width>2.46705cm</Width>
+            <ZIndex>54</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
               </Border>
-              <RightBorder>
-                <Color>Black</Color>
-                <Style>Solid</Style>
-                <Width>1pt</Width>
-              </RightBorder>
               <PaddingLeft>2pt</PaddingLeft>
               <PaddingRight>2pt</PaddingRight>
               <PaddingTop>2pt</PaddingTop>
@@ -2810,7 +2917,7 @@
             <Left>11.33222cm</Left>
             <Height>0.58649cm</Height>
             <Width>2.81486cm</Width>
-            <ZIndex>58</ZIndex>
+            <ZIndex>55</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2851,8 +2958,8 @@
             <Top>3.17235cm</Top>
             <Left>11.33222cm</Left>
             <Height>0.58649cm</Height>
-            <Width>9.02405cm</Width>
-            <ZIndex>59</ZIndex>
+            <Width>9.01347cm</Width>
+            <ZIndex>56</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2893,8 +3000,8 @@
             <Top>3.77235cm</Top>
             <Left>11.33222cm</Left>
             <Height>0.57298cm</Height>
-            <Width>2.83104cm</Width>
-            <ZIndex>60</ZIndex>
+            <Width>2.81486cm</Width>
+            <ZIndex>57</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2935,8 +3042,8 @@
             <Top>4.34533cm</Top>
             <Left>11.33222cm</Left>
             <Height>0.58649cm</Height>
-            <Width>2.83104cm</Width>
-            <ZIndex>61</ZIndex>
+            <Width>2.81486cm</Width>
+            <ZIndex>58</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -2977,8 +3084,8 @@
             <Top>4.93182cm</Top>
             <Left>11.33222cm</Left>
             <Height>0.6cm</Height>
-            <Width>2.83104cm</Width>
-            <ZIndex>62</ZIndex>
+            <Width>2.81486cm</Width>
+            <ZIndex>59</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -3020,7 +3127,7 @@
             <Left>17.28415cm</Left>
             <Height>0.60826cm</Height>
             <Width>3.06154cm</Width>
-            <ZIndex>63</ZIndex>
+            <ZIndex>60</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -3046,15 +3153,21 @@
               </Paragraph>
             </Paragraphs>
             <rd:DefaultName>FactoryRemark</rd:DefaultName>
-            <Top>3.75884cm</Top>
-            <Left>14.16326cm</Left>
-            <Height>0.6cm</Height>
-            <Width>6.18243cm</Width>
-            <ZIndex>64</ZIndex>
+            <Top>3.77235cm</Top>
+            <Left>14.14708cm</Left>
+            <Height>0.57298cm</Height>
+            <Width>6.19861cm</Width>
+            <ZIndex>61</ZIndex>
             <Style>
               <Border>
-                <Style>None</Style>
+                <Style>Solid</Style>
               </Border>
+              <BottomBorder>
+                <Style>None</Style>
+              </BottomBorder>
+              <LeftBorder>
+                <Style>None</Style>
+              </LeftBorder>
               <PaddingLeft>2pt</PaddingLeft>
               <PaddingRight>2pt</PaddingRight>
               <PaddingTop>2pt</PaddingTop>
@@ -3079,10 +3192,10 @@
             </Paragraphs>
             <rd:DefaultName>Sample</rd:DefaultName>
             <Top>4.34533cm</Top>
-            <Left>17.28415cm</Left>
+            <Left>16.47447cm</Left>
             <Height>0.58649cm</Height>
-            <Width>3.06154cm</Width>
-            <ZIndex>65</ZIndex>
+            <Width>2.49255cm</Width>
+            <ZIndex>62</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -3121,10 +3234,10 @@
             </Paragraphs>
             <rd:DefaultName>Minor</rd:DefaultName>
             <Top>4.93182cm</Top>
-            <Left>17.28415cm</Left>
+            <Left>16.47447cm</Left>
             <Height>0.58649cm</Height>
-            <Width>3.06154cm</Width>
-            <ZIndex>66</ZIndex>
+            <Width>2.49255cm</Width>
+            <ZIndex>63</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -3145,28 +3258,29 @@
               <PaddingBottom>2pt</PaddingBottom>
             </Style>
           </Textbox>
-          <Textbox Name="SpeciallyAdoption">
+          <Textbox Name="WaiveRequisition">
             <CanGrow>true</CanGrow>
             <KeepTogether>true</KeepTogether>
             <Paragraphs>
               <Paragraph>
                 <TextRuns>
                   <TextRun>
-                    <Value>=First(Fields!SpeciallyAdoption.Value, "DataSet1")</Value>
+                    <Value>=First(Fields!WaiveRequisition.Value, "DataSet1")</Value>
                     <Style>
                       <FontFamily>微軟正黑體</FontFamily>
                     </Style>
                   </TextRun>
                 </TextRuns>
-                <Style />
+                <Style>
+                  <TextAlign>Center</TextAlign>
+                </Style>
               </Paragraph>
             </Paragraphs>
-            <rd:DefaultName>SpeciallyAdoption</rd:DefaultName>
             <Top>4.93182cm</Top>
-            <Left>20.35627cm</Left>
-            <Height>0.55121cm</Height>
-            <Width>4.65057cm</Width>
-            <ZIndex>67</ZIndex>
+            <Left>18.96702cm</Left>
+            <Height>0.58649cm</Height>
+            <Width>2.57289cm</Width>
+            <ZIndex>64</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -3187,26 +3301,25 @@
               <PaddingBottom>2pt</PaddingBottom>
             </Style>
           </Textbox>
-          <Textbox Name="WaiveRequisition">
+          <Textbox Name="SpeciallyAdoption">
             <CanGrow>true</CanGrow>
             <KeepTogether>true</KeepTogether>
             <Paragraphs>
               <Paragraph>
                 <TextRuns>
                   <TextRun>
-                    <Value>=First(Fields!WaiveRequisition.Value, "DataSet1")</Value>
+                    <Value>=First(Fields!SpeciallyAdoption.Value, "DataSet1")</Value>
                     <Style />
                   </TextRun>
                 </TextRuns>
                 <Style />
               </Paragraph>
             </Paragraphs>
-            <rd:DefaultName>WaiveRequisition</rd:DefaultName>
             <Top>4.93182cm</Top>
-            <Left>24.99626cm</Left>
-            <Height>0.55121cm</Height>
-            <Width>3.98008cm</Width>
-            <ZIndex>68</ZIndex>
+            <Left>24.04223cm</Left>
+            <Height>0.6cm</Height>
+            <Width>4.93411cm</Width>
+            <ZIndex>65</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -3238,7 +3351,7 @@
             <Left>9.14775cm</Left>
             <Height>0.6cm</Height>
             <Width>11.19794cm</Width>
-            <ZIndex>69</ZIndex>
+            <ZIndex>66</ZIndex>
             <Style>
               <Border>
                 <Style>None</Style>
@@ -3249,6 +3362,60 @@
               <PaddingBottom>2pt</PaddingBottom>
             </Style>
           </Textbox>
+          <Textbox Name="Textbox22">
+            <CanGrow>true</CanGrow>
+            <KeepTogether>true</KeepTogether>
+            <Paragraphs>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>特採單號：</Value>
+                    <Style>
+                      <FontFamily>微軟正黑體</FontFamily>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style>
+                  <TextAlign>Right</TextAlign>
+                </Style>
+              </Paragraph>
+            </Paragraphs>
+            <rd:DefaultName>Textbox1</rd:DefaultName>
+            <Top>4.94533cm</Top>
+            <Left>21.5399cm</Left>
+            <Height>0.58649cm</Height>
+            <Width>2.50233cm</Width>
+            <ZIndex>67</ZIndex>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+              <RightBorder>
+                <Color>Black</Color>
+                <Style>Solid</Style>
+                <Width>1pt</Width>
+              </RightBorder>
+              <PaddingLeft>2pt</PaddingLeft>
+              <PaddingRight>2pt</PaddingRight>
+              <PaddingTop>2pt</PaddingTop>
+              <PaddingBottom>2pt</PaddingBottom>
+            </Style>
+          </Textbox>
+          <Image Name="Image1">
+            <Source>Embedded</Source>
+            <Value>avalue</Value>
+            <Sizing>FitProportional</Sizing>
+            <Top>0.10583cm</Top>
+            <Left>1.82443cm</Left>
+            <Height>1.14483cm</Height>
+            <Width>5.40124cm</Width>
+            <ZIndex>68</ZIndex>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+            </Style>
+          </Image>
         </ReportItems>
         <KeepTogether>true</KeepTogether>
         <Top>0.34078cm</Top>
@@ -3497,6 +3664,19 @@
       </rd:DataSetInfo>
     </DataSet>
   </DataSets>
+  <EmbeddedImages>
+    <EmbeddedImage Name="avalue">
+      <MIMEType>image/png</MIMEType>
+      <ImageData>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</ImageData>
+    </EmbeddedImage>
+  </EmbeddedImages>
   <rd:ReportUnitType>Cm</rd:ReportUnitType>
   <rd:ReportID>3d6db279-309d-4d29-9940-23cf8e69bde0</rd:ReportID>
 </Report>
\ No newline at end of file
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs
index a3393729..f4047425 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs
@@ -507,7 +507,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
             try
             {
+                _context.Entry(barcodeItem.B).State = EntityState.Detached;
                 _context.BarcodeItems.Add(barcodeItem);
+           
                 await _context.SaveChangesAsync();
                 result.Success = true;
                 result.Msg = "OK";
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
index ad0c49b5..a3e87acc 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
@@ -215,10 +215,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                        ItemNo = q1.ItemNo,
                                        ModelNo = q1.ModelNo,
                                        InhouseQty = q1.InhouseQty,
+                                       SpecialPo = q2.SpecialPo,
                                        QcQty = q3.QcQty,
                                        AcQty = q3.AcQty,
                                        ReQty = q3.ReQty,
-                                       StatusName = q1.Status,
+                                       StatusName = q1.Status == "P" ? "允收Pass" : q1.Status == "R" ? "批退Reject" : "",
                                        FqcID = q2.WipNo == null ? 0 : q2.FqcID,
                                        InhouseMemo = q2.InhouseMemo,
                                        ManualQaMeno = q2.ManualQaMeno,
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/FQC010VIiew.cs b/AMESCoreStudio.WebApi/DTO/AMES/FQC010VIiew.cs
index f8d748a3..8931f822 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/FQC010VIiew.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/FQC010VIiew.cs
@@ -46,12 +46,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         public string OrderNumber { get; set; }
 
         /// <summary>
-        /// 
+        /// 批量
         /// </summary>
         public string LotSize { get; set; }
 
         /// <summary>
-        /// 
+        /// 醫療機種
         /// </summary>
         public string MedicalModel { get; set; }
 
@@ -61,9 +61,8 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         public string VIP { get; set; }
 
         /// <summary>
-        /// 
+        /// 抽樣
         /// </summary>
-
         public string InspectionType { get; set; }
 
         /// <summary>
@@ -85,12 +84,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         public string Factory { get; set; }
 
         /// <summary>
-        /// 產線
+        /// 產線備註
         /// </summary>
         public string Line { get; set; }
 
         /// <summary>
-        /// 
+        /// 入庫庫別
         /// </summary>
         public string StorageLocation { get; set; }
 
@@ -106,39 +105,78 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
 
         public string AQL { get; set; }
 
+        /// <summary>
+        /// 抽驗數
+        /// </summary>
         public string Sample { get; set; }
 
+        /// <summary>
+        /// 允收數
+        /// </summary>
         public string AC { get; set; }
 
+        /// <summary>
+        /// 不良數
+        /// </summary>
         public string ReMajor { get; set; }
 
+        /// <summary>
+        /// 檢驗結果Judgment Quantity
+        /// </summary>
         public string Judgment { get; set; }
 
+        /// <summary>
+        /// Major
+        /// </summary>
         public string Major { get; set; }
 
+        /// <summary>
+        /// Minor
+        /// </summary>
         public string Minor { get; set; }
 
         /// <summary>
         /// 特採單
         /// </summary>
-        public string SpeciallyAdoption { get; set; }
+        public string SpeciallyAdoption { get; set; } = "N/A";
 
+        /// <summary>
+        /// 判斷結果
+        /// </summary>
         public string WaiveRequisition { get; set; }
 
+        /// <summary>
+        /// 缺點描述
+        /// </summary>
         public string DefectDescription { get; set; }
 
-        public string NOTE { get; set; }
+        public string NOTE { get; set; } = "N/A";
 
-        public string FactoryRemark { get; set; }
+        /// <summary>
+        /// 委外廠 Name
+        /// </summary>
+        public string FactoryRemark { get; set; } = "N/A";
 
-        public string ECNMemo { get; set; }
+        public string ECNMemo { get; set; } = "N/A";
 
+        /// <summary>
+        /// 檢驗儀器編號
+        /// </summary>
         public string InspectionInstrumentNumber { get; set; }
 
-        public string InspectionItems { get; set; }
+        /// <summary>
+        /// 檢驗項目 OS CPU RAM
+        /// </summary>
+        public string InspectionItems { get; set; } = "N/A";
 
+        /// <summary>
+        /// 抽驗人員
+        /// </summary>
         public string Approved { get; set; }
 
+        /// <summary>
+        /// 主管
+        /// </summary>
         public string Inspector { get; set; }
 
         public List<FQC010Detail1> Detail1 { get; set; }
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs
index 7f1924f0..fb08a97e 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs
@@ -137,6 +137,11 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [Display(Name = "拒收數量")]
         public int ReQty { get; set; } = 0;
 
+        /// <summary>
+        /// 特採單
+        /// </summary>
+        public string SpecialPo { get; set; }
+
         /// <summary>
         /// 判定備註
         /// </summary>