报告导出BUG个修正

Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData RunMode="ProfessionalMode" SysType="BatteryCleannessA">
+<XMLData RunMode="ProfessionalMode" SysType="TCCleannessA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="NoSTDDB" SteelTechnology="0" UseSysSTD="true" />
   <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" OverlapParam="0" ParticleSelectionCondition="">
-    <Member RegName="BGGray" end="255" start="80" />
+    <Member RegName="BGGray" end="255" start="153" />
     <Member RegName="IncArea" end="100" start="3" />
-    <Member RegName="ParticleGray" end="90" start="50" />
+    <Member RegName="ParticleGray" end="255" start="0" />
   </Member>
-  <Member RegName="ImageScanParam" ImageResolution="4:_1536_1024" SatrtImageMode="0:Spiral" ScanImageSpeed="0:low" StopMode="0:CoverMode" StopParamArea="10" StopParamFields="100" StopParamMeasTime="360" StopParamParticles="5000" />
+  <Member RegName="ImageScanParam" ImageResolution="3:_1024_768" SatrtImageMode="0:Spiral" ScanImageSpeed="0:low" StopMode="0:CoverMode" StopParamArea="10" StopParamFields="100" StopParamMeasTime="360" StopParamParticles="5000" />
   <Member RegName="StageData" ControlDelay="1000" MinMag="65" scanFieldSize="1270" xAxisDir="0:LEFT_TOWARD" yAxisDir="1:DOWN_TOWARD">
     <Member RegName="XAxis" end="55000" start="-55000" />
     <Member RegName="YAxis" end="55000" start="-55000" />

Bin/x64/Debug/Config/SysData/OTSReportMgrParam.rpf

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData systype="BatteryCleannessA">
+<XMLData systype="TCCleannessA">
   <Member RegName="Scale" strValue="1000" />
   <Member RegName="DefaultComputedColName" strValue="Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation" />
   <Member RegName="ElementsColName" strValue="C,O,Al,Fe,F,Ti,Na,Mn,Mg" />
-  <Member RegName="PartSizeFile" name="lj.psf" />
+  <Member RegName="PartSizeFile" name="lj2.psf" />
   <Member RegName="TRIO_CHART_TYPE" strValue="CaO.SiO₂.Al₂O₃" />
   <Member RegName="SIZE_CAL_METHOD_TYPE" strValue="DMAX" />
 </XMLData>

Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -447,6 +447,8 @@
 		<Control name="library_does_not_match" text="Standard library not compliant!" />
 	  
 	  
+	  <Control name="tcleannessa" text="Loading: Vehicle Cleanliness VDA19……" />
+	<Control name="tcleannessa_fail" text="Car cleanliness VDA19 loading failed!" />
 	  
 	  
 	  <Control name="dev_ypbh_up" text="SamlpID:" /> 

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -395,7 +395,8 @@
 	<Control name="language" text="ZH" />
 	<Control name="library_does_not_match" text="未找到标准库！" />
 	
-	
+	<Control name="tcleannessa" text="加载：汽车清洁度VDA19……" />
+	<Control name="tcleannessa_fail" text="汽车清洁度VDA19加载失败！" />
 	
 	
 	<Control name="dev_bgsj_up" text="报告时间:" />

OTSIncAReportApp/1-UI/OTSReportExport/Category.cs

@@ -21,6 +21,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport
         /// 窗体是否修改
         /// </summary>
         public bool IsModify = false;
+        public List<string> vs = new List<string>();
         Hashtable table;
      
         public Category(List<string> a_ElementList, List<string> AllList)
@@ -72,9 +73,16 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport
                 if (checkedListBox1.GetItemChecked(i))
                 {
                     OutElementList.Add(checkedListBox1.Items[i].ToString());
+                    vs.Add("1");
+                }
+                else
+                {
+                    vs.Add("0");
                 }
             }
             IsModify = true;
+            
+
             this.Close();
         }
         /// <summary>

OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/BasicData.cs

@@ -158,6 +158,26 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             }
 
             DataTable datass = m_bt_DBData.Clone();
+            string str = m_otsreport_export.m_mbszclass.M_SY.StandardLibraryName;
+            OTSCommon.DBOperate.SqLiteHelper sh;
+
+            string fullPath = GetFilePath() + "\\" + str;
+            string fullPath2 = System.IO.Directory.GetCurrentDirectory() + "\\Config\\SysData\\" + str;
+            if (System.IO.File.Exists(fullPath))
+            {
+                sh = new OTSCommon.DBOperate.SqLiteHelper("data source='" + fullPath + "'");
+            }
+            else if (System.IO.File.Exists(fullPath2))
+            {
+                sh = new OTSCommon.DBOperate.SqLiteHelper("data source='" + fullPath2 + "'");
+            }
+            else
+            {
+                sh = null;
+                
+            }
+            DataTable dt_stl = sh.ExecuteQuery("select * from ClassifySTD");
+            DataTable LargeClassificationTable = sh.ExecuteQuery("select * from STDGroups");
 
             for (int i = 0; i < m_mbszclass.list_str_MainPriority.Count; i++)
             {
@@ -174,35 +194,32 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                 if (!bl)
                 {
                     DataTable dta = m_bt_DBData.Clone();
-                    //DataTable dtb = m_bt_DBData.Clone();
                     // 添加一个空行
                     DataRow newRow = dta.NewRow();
                     dta.Rows.Add(newRow);
 
-
-                    //if (m_bt_DBData.Rows.Count != 0)
-                    //{
-                        //dta.Rows.Add(dtb.Rows[0].ItemArray);
-                        for (int b = 0; b < dta.Columns.Count; b++)
+                    for (int b = 0; b < dta.Columns.Count; b++)
+                    {
+                        if (dta.Columns[b].ColumnName == "TypeName")
                         {
-                            if (dta.Columns[b].ColumnName == "TypeName")
-                            {
-                                dta.Rows[0][b] = m_mbszclass.list_str_MainPriority[i];
-                            }
-                            else if (dta.Columns[b].ColumnName == "Class")
-                            {
-                                dta.Rows[0][b] = "Default";
-                            }
-                            else
+                            dta.Rows[0][b] = m_mbszclass.list_str_MainPriority[i];
+                        }
+                        else if (dta.Columns[b].ColumnName == "Class")
+                        {
+                            for (int c = 0; c < LargeClassificationTable.Rows.Count; c++)
                             {
-                                dta.Rows[0][b] = 0;
+                                if (LargeClassificationTable.Rows[c]["id"].ToString() == dt_stl.Rows[i]["GroupId"].ToString())
+                                {
+                                    dta.Rows[0][b] = LargeClassificationTable.Rows[c]["name"].ToString();
+                                }
                             }
                         }
-
-                        datass.Rows.Add(dta.Rows[0].ItemArray);
-                    //}
-
-
+                        else
+                        {
+                            dta.Rows[0][b] = 0;
+                        }
+                    }
+                    datass.Rows.Add(dta.Rows[0].ItemArray);
                 }
             }
             BData = datass.Copy();

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Export.cs

@@ -98,6 +98,10 @@ namespace OTSIncAReportApp
             /// </summary>
             public List<string> list_str_MainPriority { get; set; }
             /// <summary>
+            /// 主要优先排序序号
+            /// </summary>
+            public List<string> list_str_MainPriority_Serial { get; set; }
+            /// <summary>
             /// 次要优先排序string
             /// </summary>
             public string str_SecondaryPriority { get; set; }
@@ -127,6 +131,7 @@ namespace OTSIncAReportApp
                 M_KLLBXX.list_str_kllb_DeleteClass = new List<string>();
                 M_DZ = new DZ();
                 list_str_MainPriority = new List<string>();
+                list_str_MainPriority_Serial = new List<string>();
                 list_str_SecondaryPriority = new List<string>();
                 str_MainPriority = "";
                 str_SecondaryPriority = "";
@@ -1098,6 +1103,23 @@ namespace OTSIncAReportApp
                     m_mbszclass.list_str_MainPriority.Add(str);
                 }
             }
+
+            m_mbszclass.list_str_MainPriority_Serial.Clear();
+            for (int i = 0; i < 100; i++)                              //全局优先排序
+            {
+                string str = xmlutil.Read("whole", "list_str_MainPriority_Serial", "YS" + i.ToString());
+                if (str == null)
+                {
+                    break;
+                }
+                else
+                {
+                    m_mbszclass.list_str_MainPriority_Serial.Add(str);
+                }
+            }
+
+
+
             m_mbszclass.list_str_SecondaryPriority.Clear();
             for (int i = 0; i < 100; i++)                              //全局次要排序
             {

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.Designer.cs

@@ -74,6 +74,7 @@
             this.button3 = new System.Windows.Forms.Button();
             this.textBox_zypxss = new System.Windows.Forms.TextBox();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.cb_TccleanlinessA = new System.Windows.Forms.CheckBox();
             this.label2 = new System.Windows.Forms.Label();
             this.button7 = new System.Windows.Forms.Button();
             this.groupBox4 = new System.Windows.Forms.GroupBox();
@@ -83,7 +84,6 @@
             this.groupBox5 = new System.Windows.Forms.GroupBox();
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
-            this.cb_TccleanlinessA = new System.Windows.Forms.CheckBox();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
@@ -577,6 +577,7 @@
             this.textBox_zypxss.Location = new System.Drawing.Point(6, 14);
             this.textBox_zypxss.Multiline = true;
             this.textBox_zypxss.Name = "textBox_zypxss";
+            this.textBox_zypxss.ReadOnly = true;
             this.textBox_zypxss.Size = new System.Drawing.Size(672, 41);
             this.textBox_zypxss.TabIndex = 65;
             // 
@@ -601,6 +602,17 @@
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "模块设定";
             // 
+            // cb_TccleanlinessA
+            // 
+            this.cb_TccleanlinessA.AutoSize = true;
+            this.cb_TccleanlinessA.Enabled = false;
+            this.cb_TccleanlinessA.Location = new System.Drawing.Point(18, 24);
+            this.cb_TccleanlinessA.Name = "cb_TccleanlinessA";
+            this.cb_TccleanlinessA.Size = new System.Drawing.Size(60, 16);
+            this.cb_TccleanlinessA.TabIndex = 69;
+            this.cb_TccleanlinessA.Text = "VDA-19";
+            this.cb_TccleanlinessA.UseVisualStyleBackColor = true;
+            // 
             // label2
             // 
             this.label2.AutoSize = true;
@@ -694,17 +706,6 @@
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "图标选择";
             // 
-            // cb_TccleanlinessA
-            // 
-            this.cb_TccleanlinessA.AutoSize = true;
-            this.cb_TccleanlinessA.Enabled = false;
-            this.cb_TccleanlinessA.Location = new System.Drawing.Point(18, 24);
-            this.cb_TccleanlinessA.Name = "cb_TccleanlinessA";
-            this.cb_TccleanlinessA.Size = new System.Drawing.Size(60, 16);
-            this.cb_TccleanlinessA.TabIndex = 69;
-            this.cb_TccleanlinessA.Text = "VDA-19";
-            this.cb_TccleanlinessA.UseVisualStyleBackColor = true;
-            // 
             // OTSReport_Template_CleannessA
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.cs

@@ -27,6 +27,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
         private string CurrentDatabase = "";
         private bool SwitchCategories = false;
+        private List<string> TCCleannessAList = new List<string>();
+        private List<string> list_MainPriority = new List<string>();
         #endregion
 
         #region 构造函数及窗体加载
@@ -329,8 +331,16 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 {
                     xmlutil.Write(m_OTSReport_Export.m_mbszclass.list_str_MainPriority[i].ToString(), "whole", "list_str_MainPriority", "YS" + i.ToString());
                 }
-               
+
+                //优先排序
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial.ToString(), "whole", "list_str_MainPriority_Serial");//全局优先排序
+                for (int i = 0; i < m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial.Count; i++)                              //去除元素列表
+                {
+                    xmlutil.Write(m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial[i].ToString(), "whole", "list_str_MainPriority_Serial", "YS" + i.ToString());
+                }
                 
+
+
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_ljb, "M_SYXT", "str_cb_syxt_ljb");
 
                 //备注
@@ -357,13 +367,21 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             //}
             //主要优先显示
             m_OTSReport_Export.m_mbszclass.list_str_MainPriority.Clear();
-            string[] MainPriority = textBox_zypxss.Text.Split(new char[] { ',' });
-            for (int i = 0; i < MainPriority.Length; i++)
-            {
-                if (textBox_zypxss.Text.Split(',')[i] != "")
-                    m_OTSReport_Export.m_mbszclass.list_str_MainPriority.Add(MainPriority[i]);
-            }
-            
+            m_OTSReport_Export.m_mbszclass.list_str_MainPriority = list_MainPriority;
+            //string[] MainPriority = textBox_zypxss.Text.Split(new char[] { '/' });
+            //for (int i = 0; i < MainPriority.Length; i++)
+            //{
+            //    if (textBox_zypxss.Text.Split('/')[i] != "")
+            //        m_OTSReport_Export.m_mbszclass.list_str_MainPriority.Add(MainPriority[i]);
+            //}
+
+            //主要优先显示顺序
+            m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial.Clear();
+            m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial= TCCleannessAList;
+         
+
+
+
             m_OTSReport_Export.m_mbszclass.M_SY.LOGName = fileName;
             //首页
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_ZBT = tb_ZBT.Text;
@@ -455,7 +473,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
 
             textBox1.Text = m_OTSReport_Export.m_mbszclass.M_DZ.Notes;
-
+            TCCleannessAList = m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial;
             LoadingIcon();
         }
         private void  LoadingIcon()
@@ -746,9 +764,13 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                         vs.Add(MainPriority[i]);
                 }
             }
+
+            
             Category category = new Category(vs, ReadClassification(comboBox1.SelectedIndex));
             category.ShowDialog();
             List<string> ls = category.OutElementList;
+            TCCleannessAList = category.vs;
+            list_MainPriority = category.OutElementList;
             string str = "";
             for (int i = 0; i < ls.Count; i++)
             {
@@ -758,7 +780,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 }
                 else
                 {
-                    str = str + ls[i] + ",";
+                    str = str + ls[i] + " , ";
                 }
             }
             if (category.IsModify)

OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.cs

@@ -563,11 +563,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 string[] fruits = text.Split(delimiters, StringSplitOptions.None);
              
 
-                if(metal1== int.MaxValue && Convert.ToInt32(fruits[0])>= 400)
+                if(metal1== int.MaxValue && Convert.ToDouble(fruits[0])>= 400.0)
                 {
                     metal1 = i;
                 }
-                if (metal2 == int.MaxValue && Convert.ToInt32(fruits[0]) >= 600)
+                if (metal2 == int.MaxValue && Convert.ToDouble(fruits[0]) >= 600.0)
                 {
                     metal2 = i;
                 }
@@ -665,16 +665,16 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         private void  AddTCCleannessA(List<DataTable> List_data, BasicData basicData)
         {
             List<string> vs = basicData.GetParticlesizeTable();
-            List<int> listMin = new List<int>();
-            List<int> listMax = new List<int>();
+            List<double> listMin = new List<double>();
+            List<double> listMax = new List<double>();
             for (int i=0;i< vs.Count;i++)
             {
                 string text = vs[i];
                 char[] delimiters = new char[] { '~' };
                 string[] fruits = text.Split(delimiters, StringSplitOptions.None);
-                listMin.Add(Convert.ToInt32(fruits[0]) );
+                listMin.Add(Convert.ToDouble(fruits[0]) );
                 if (i != vs.Count - 1)
-                    listMax.Add(Convert.ToInt32(fruits[1]));
+                    listMax.Add(Convert.ToDouble(fruits[1]));
                 else
                 {
                     listMax.Add(int.MaxValue);
@@ -700,7 +700,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             int c7_int = 0;
             int c8_int = 0;
             int total_int = 0;
-            int maximum_int = 0;
+            double maximum_int = 0;
             for (int a=0;a< List_data.Count;a++)
             {
                 DataTable data = List_data[a];
@@ -724,22 +724,26 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                         (xt_TCleannessA.Rows[1].Cells[1].WidthF, data.Rows[i]["total"].ToString(), DevExpress.XtraPrinting.BorderSide.All, Convert.ToInt32(data.Rows[i]["metal"]), 0, false);
                     XRTableCell tCell_Maxmum = TCCleannessTableStyle
                         (xt_TCleannessA.Rows[1].Cells[2].WidthF, data.Rows[i]["maximum"].ToString(), DevExpress.XtraPrinting.BorderSide.All, Convert.ToInt32(data.Rows[i]["metal"]), 0, false);
-                    XRTableCell tCell_size_1 = TCCleannessTableStyle
-                        (xt_TCleannessA.Rows[1].Cells[3].WidthF, data.Rows[i]["c1"].ToString(), DevExpress.XtraPrinting.BorderSide.All, Convert.ToInt32(data.Rows[i]["metal"]), listMin[0], true);
-                    XRTableCell tCell_size_2 = TCCleannessTableStyle
-                        (xt_TCleannessA.Rows[1].Cells[4].WidthF, data.Rows[i]["c2"].ToString(), DevExpress.XtraPrinting.BorderSide.All, Convert.ToInt32(data.Rows[i]["metal"]), listMin[1], true);
-                    XRTableCell tCell_size_3 = TCCleannessTableStyle
-                        (xt_TCleannessA.Rows[1].Cells[5].WidthF, data.Rows[i]["c3"].ToString(), DevExpress.XtraPrinting.BorderSide.All, Convert.ToInt32(data.Rows[i]["metal"]), listMin[2], true);
-                    XRTableCell tCell_size_4 = TCCleannessTableStyle
-                        (xt_TCleannessA.Rows[1].Cells[6].WidthF, data.Rows[i]["c4"].ToString(), DevExpress.XtraPrinting.BorderSide.All, Convert.ToInt32(data.Rows[i]["metal"]), listMin[3], true);
-                    XRTableCell tCell_size_5 = TCCleannessTableStyle
-                        (xt_TCleannessA.Rows[1].Cells[7].WidthF, data.Rows[i]["c5"].ToString(), DevExpress.XtraPrinting.BorderSide.All, Convert.ToInt32(data.Rows[i]["metal"]), listMin[4], true);
-                    XRTableCell tCell_size_6 = TCCleannessTableStyle
-                        (xt_TCleannessA.Rows[1].Cells[8].WidthF, data.Rows[i]["c6"].ToString(), DevExpress.XtraPrinting.BorderSide.All, Convert.ToInt32(data.Rows[i]["metal"]), listMin[5], true);
-                    XRTableCell tCell_size_7 = TCCleannessTableStyle
-                        (xt_TCleannessA.Rows[1].Cells[9].WidthF, data.Rows[i]["c7"].ToString(), DevExpress.XtraPrinting.BorderSide.All, Convert.ToInt32(data.Rows[i]["metal"]), listMin[6], true);
-                    XRTableCell tCell_size_8 = TCCleannessTableStyle
-                        (xt_TCleannessA.Rows[1].Cells[10].WidthF, data.Rows[i]["c8"].ToString(), DevExpress.XtraPrinting.BorderSide.All, Convert.ToInt32(data.Rows[i]["metal"]), listMin[7], true);
+                    row.Cells.Add(tCell_Class);
+                    row.Cells.Add(tCell_total);
+                    row.Cells.Add(tCell_Maxmum);
+                    for (int b=1;b< 9;b++)
+                    {
+                        XRTableCell tCell_size;
+                        if (b< listMin.Count)
+                        {
+                             tCell_size = TCCleannessTableStyle
+                   (xt_TCleannessA.Rows[1].Cells[b+2].WidthF, data.Rows[i]["c" + (b).ToString()].ToString(), DevExpress.XtraPrinting.BorderSide.All, Convert.ToInt32(data.Rows[i]["metal"]), listMin[b - 1], true);
+                        }
+                        else
+                        {
+                             tCell_size = TCCleannessTableStyle
+                  (xt_TCleannessA.Rows[1].Cells[b+2].WidthF, data.Rows[i]["c" + (b).ToString()].ToString(), DevExpress.XtraPrinting.BorderSide.All, Convert.ToInt32(data.Rows[i]["metal"]), 0, true);
+                            
+                        }
+                        row.Cells.Add(tCell_size);
+                    }
+
 
                     XRTableCell tCell_HV = new XRTableCell();
                     tCell_HV.WidthF = xt_TCleannessA.Rows[1].Cells[11].WidthF;
@@ -757,17 +761,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                     {
                         tCell_HV.ForeColor = Color.Red;
                     }
-                    row.Cells.Add(tCell_Class);
-                    row.Cells.Add(tCell_total);
-                    row.Cells.Add(tCell_Maxmum);
-                    row.Cells.Add(tCell_size_1);
-                    row.Cells.Add(tCell_size_2);
-                    row.Cells.Add(tCell_size_3);
-                    row.Cells.Add(tCell_size_4);
-                    row.Cells.Add(tCell_size_5);
-                    row.Cells.Add(tCell_size_6);
-                    row.Cells.Add(tCell_size_7);
-                    row.Cells.Add(tCell_size_8);
+
                     row.Cells.Add(tCell_HV);
                     xt_TCleannessA.Rows.Add(row);
 
@@ -809,9 +803,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                     }
                     if (!string.IsNullOrEmpty(data.Rows[i]["maximum"].ToString()))
                     {
-                        if (maximum_int < Convert.ToInt32(data.Rows[i]["maximum"]))
+                        if (maximum_int < Convert.ToDouble(data.Rows[i]["maximum"]))
                         {
-                            maximum_int = Convert.ToInt32(data.Rows[i]["maximum"]);
+                            maximum_int = Convert.ToDouble(data.Rows[i]["maximum"]);
                         }
                     }
                 }
@@ -830,65 +824,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             xrTable5.Rows[0].Cells[10].Text = c8_int.ToString();
         }
 
-        private XRTable TCleannessATableStructure()
-        {
-            XRTable xR = new XRTable();
-            xR.Rows.Add(TCleannessAXRTableRow(DevExpress.XtraPrinting.TextAlignment.MiddleLeft));
-            xR.Rows.Add(TCleannessAXRTableRow(DevExpress.XtraPrinting.TextAlignment.MiddleRight));
-            return xR;
-        }
         
-        private XRTableRow TCleannessAXRTableRow(DevExpress.XtraPrinting.TextAlignment Alignment)
-        {
-            XRTableRow row = new XRTableRow();
-            XRTableCell tCell_1 = new XRTableCell();
-            tCell_1.WidthF = 95.53f;
-            row.Cells.Add(tCell_1);
-            XRTableCell tCell_2 = new XRTableCell();
-            tCell_2.WidthF = 58.32f;
-            row.Cells.Add(tCell_2);
-            XRTableCell tCell_3 = new XRTableCell();
-            tCell_3.WidthF = 58.32f;
-            row.Cells.Add(tCell_3);
-            XRTableCell tCell_4 = new XRTableCell();
-            tCell_4.WidthF = 51.13f;
-            tCell_4.TextAlignment = Alignment;
-            row.Cells.Add(tCell_4);
-            XRTableCell tCell_5 = new XRTableCell();
-            tCell_5.WidthF = 51.13f;
-            tCell_5.TextAlignment = Alignment;
-            row.Cells.Add(tCell_5);
-            XRTableCell tCell_6 = new XRTableCell();
-            tCell_6.WidthF = 51.13f;
-            tCell_6.TextAlignment = Alignment;
-            row.Cells.Add(tCell_6);
-            XRTableCell tCell_7 = new XRTableCell();
-            tCell_7.WidthF = 51.13f;
-            tCell_7.TextAlignment = Alignment;
-            row.Cells.Add(tCell_7);
-            XRTableCell tCell_8 = new XRTableCell();
-            tCell_8.WidthF = 51.13f;
-            tCell_8.TextAlignment = Alignment;
-            row.Cells.Add(tCell_8);
-            XRTableCell tCell_9 = new XRTableCell();
-            tCell_9.WidthF = 51.13f;
-            tCell_9.TextAlignment = Alignment;
-            row.Cells.Add(tCell_9);
-            XRTableCell tCell_10 = new XRTableCell();
-            tCell_10.WidthF = 51.13f;
-            tCell_10.TextAlignment = Alignment;
-            row.Cells.Add(tCell_10);
-            XRTableCell tCell_11 = new XRTableCell();
-            tCell_11.WidthF = 51.13f;
-            tCell_11.TextAlignment = Alignment;
-            row.Cells.Add(tCell_11);
-            XRTableCell tCell_12 = new XRTableCell();
-            tCell_12.WidthF = 66.81f;
-            row.Cells.Add(tCell_12);
-            return row;
-        }
+        
+ 
 
-        private XRTableCell TCCleannessTableStyle(float  widthF, string str, DevExpress.XtraPrinting.BorderSide border,int iIS,int minSize,bool bl)
+        private XRTableCell TCCleannessTableStyle(float  widthF, string str, DevExpress.XtraPrinting.BorderSide border,int iIS, double minSize,bool bl)
         {
             XRTableCell tCell = new XRTableCell();
             tCell.WidthF = widthF;