补充提交

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -2187,7 +2187,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             g.FillRectangle(sbrush_White, 0, 0, 450, 115);
             Font myFont = new Font("Arial Unicode MS", 10, FontStyle.Bold);
             Font myFont2 = new Font("Arial Unicode MS", 10, FontStyle.Regular);
-            g.DrawString("legend(length,microns)", myFont, sbrush, 140, 3);
+            g.DrawString("legend(length,μm)", myFont, sbrush, 140, 3);
             //legend(length,microns)
             Pen mypen = new Pen(Color.Black, 1);
             g.DrawLine(mypen, 100, 19, 350, 19);
@@ -2212,7 +2212,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             double d = Convert.ToDouble(sizestr.Split(',')[sizestr.Split(',').Length - 1]);
             listName.Add(d.ToString() + "~MAX");
             int PositionJeight = 27;
-            string str_unit = " microns";
+            string str_unit = " μm";
             for (int i=0;i< listName.Count;i=i+3)
             {
                 if (i< listName.Count)

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -255,75 +255,57 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
- 
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Data.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Office.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Pdf.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.PivotGrid.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.RichEdit.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.RichEdit.v21.2.Export, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
- 
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Utils.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.Utils.v21.2.UI, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.XtraCharts.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.XtraGauges.v21.2.Core, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.XtraReports.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="DevExpress.XtraReports.v21.2.Extensions, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a">
-
       <Private>False</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
@@ -897,6 +879,7 @@
     <EmbeddedResource Include="1-UI\OTSTemplateDesigner\OTSReport_TemplateDesignerRM.resx">
       <DependentUpon>OTSReport_TemplateDesignerRM.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="ReportTemplate\GBReport.resx">
       <DependentUpon>GBReport.cs</DependentUpon>
     </EmbeddedResource>

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.cs

@@ -205,7 +205,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             dev_size_6.Text = ls_partsize_dt.Rows[0]["c6"].ToString();
             dev_size_7.Text = ls_partsize_dt.Rows[0]["c7"].ToString();
             dev_DimensionTable_2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            dev_DimensionTable_2.Text = dev_DimensionTable_2.Text.ToString() + TemplateClass.M_KLFXJG.str_cb_klcc_jsfs.ToString() + ", microns";
+            dev_DimensionTable_2.Text = dev_DimensionTable_2.Text.ToString() + TemplateClass.M_KLFXJG.str_cb_klcc_jsfs.ToString() + ", μm";
             dev_DimensionTable_2.Font = new Font(Schriftart_chinese, dev_DimensionTable_2.Font.Size);
             for (int i = 0; i < surface_dt.Rows.Count; i++)
             {
@@ -905,11 +905,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                             xRTable.Rows[1].Cells[2].Text = listData[a].Rows[b]["pid"].ToString();
                             xRTable.Rows[1].Cells[3].Text = listData[a].Rows[b]["Size"].ToString();
 
-                            for (int c = 1; c < 11; c++)
+                            for (int c = 1; c < 10; c++)
                             {
                                 
-                                xRTable.Rows[2].Cells[c-1].Text = listData[a].Rows[b]["ColName" + (c).ToString()].ToString();
-                                xRTable.Rows[3].Cells[c-1].Text = listData[a].Rows[b]["ColVal" + (c).ToString()].ToString();
+                                xRTable.Rows[2].Cells[c].Text = listData[a].Rows[b]["ColName" + (c).ToString()].ToString();
+                                xRTable.Rows[3].Cells[c].Text = listData[a].Rows[b]["ColVal" + (c).ToString()].ToString();
                             }
 
                             xRTable.LocationF = new PointF(0, NeueStartposition );