报告程序优化修改，兼容以前版本

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

@@ -389,7 +389,7 @@
 	<Control name="button3" text="打开文件" />
 	<Control name="label2" text="当前导出进度" />
 	<Control name="button7" text="国标导出" />
-	<Control name="btn_preview" text="打开报表" />
+	<Control name="btn_preview" text="生成预览" />
 	<Control name="btn_exit" text="退  出" />
 	<Control name="loading" text="加载：" />
 	<Control name="measurement_result" text="加载：测量结果信息表……" />

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

@@ -98,62 +98,6 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 cb_TccleanlinessA.Enabled = true;
             }
 
-			//RuleGroup = ObtainParticleCategory_start(m_OTSReport_Export);
-			//List_data = ObtainRuleData_start(RuleGroup, StandardLibraryAddress);
-
-
-
-   //         string[] Separator = { " , " };
-   //         string[] parts = m_OTSReport_Export.m_mbszclass.str_MainPriorityID.ToString().Split(Separator, StringSplitOptions.RemoveEmptyEntries);
-   //         List<string> strings1 = new List<string>();
-			//for (int i = 0; i < parts.Length; i++)
-   //         {
-			//	string[] strss = parts[i].ToString().Split(':');
-   //             bool bl = false; 
-   //             for (int a = 0; a < strings1.Count; a++)
-   //             {
-   //                 if (strings1[a] == strss[0])
-   //                 {
-   //                     bl = true;
-			//		}
-   //             }
-   //             if (!bl)
-   //             {
-   //                 strings1.Add(strss[0]);
-
-			//	}
-			//}
-   //         //循环每个组
-   //         for (int i = 0; i < List_data.Count; i++)
-   //         {
-   //             string groupID = List_data[i].TableName;
-
-   
-   //                 for (int j = 0; j < strings1.Count; j++)
-   //                 {
-   //                     if (List_data[i].TableName.ToString() == strings1[j])
-   //                     {
-			//				RuleGroup.Rows[i]["display"] = "1";
-			//			}
-
-   //                 }
-  
-   //             //循环当前组中的规则
-   //             for (int a = 0; a < List_data[i].Rows.Count; a++)
-   //             {
-   //                 //循环记录勾选的规则信息
-   //                 for (int j = 0; j < parts.Length; j++)
-   //                 {
-			//			string[] strss = parts[j].ToString().Split(':');
-   //                     if (List_data[i].Rows[a]["STDId"].ToString() == strss[1])
-   //                     {
-   //                         List_data[i].Rows[a]["display"] = 1;
-			//			}
-   //                 }
-   //             }
-			//}
-
-			//UpdateRuleSelectionDisplay();
 
             textBox_zypxss.Text = m_OTSReport_Export.m_mbszclass.str_MainPriority.ToString();
 		}

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

@@ -331,6 +331,25 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
 				}
 
                 BData = OutData.Copy();
+				Measurements = new List<DataTable>();
+
+				for (int i = 0; i < GroupInformation.Count; i++)
+				{
+					DataTable table = dtp.Clone();
+					for (int a = 0; a < dtp.Rows.Count; a++)
+					{
+                        string strGroupId = "Default";
+						if (dtp.Rows[a]["GroupName"].ToString() != "") 
+                        {
+                            strGroupId = dtp.Rows[a]["GroupName"].ToString();
+						}
+						if (GroupInformation[i] == strGroupId)
+						{
+							table.Rows.Add(dtp.Rows[a].ItemArray);
+						}
+					}
+					Measurements.Add(table);
+				}
 				return;
 			}
 
@@ -410,7 +429,12 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
 				{
 					if (Convert.ToInt64(dtp.Rows[i]["TypeId"]) > 10)
 					{
-						if (stringsa[i].ToString() == dtp.Rows[a]["GroupName"].ToString())
+                        string strGroupName = "Default";
+                        if (dtp.Rows[a]["GroupName"].ToString() != "")
+                        {
+                            strGroupName = dtp.Rows[a]["GroupName"].ToString();
+						}
+						if (stringsa[i].ToString() == strGroupName)
 						{
 							data.Rows.Add(dtp.Rows[a].ItemArray);
 						}
@@ -609,7 +633,17 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
         /// <returns></returns>
         public string GetResfile()
         {
-            return resfile.GetSTDName();
+            string str_libraryName = "";
+            bool endsWithDb = resfile.GetSTDName().EndsWith(".db", StringComparison.OrdinalIgnoreCase);
+            if (endsWithDb)
+            {
+                str_libraryName = resfile.GetSTDName();
+            }
+            else
+            {
+                str_libraryName = resfile.GetSTDName() + ".db";
+			}
+                return str_libraryName;
         }
         public void IsFilePath(OTSReport_Export m_otsreport_export)
         {

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Export.cs

@@ -1233,7 +1233,17 @@ namespace OTSIncAReportApp
 			ResultFile resfile = m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResultId()];
 			string str_libraryName = resfile.GetSTDName();
 			bool endsWithDb = str_libraryName.EndsWith(".db", StringComparison.OrdinalIgnoreCase);
-			string fullPathR = m_ReportApp.m_rstDataMgr.CurResultFile.FilePath + "\\" + str_libraryName;
+            string fullPathR = "";
+
+            if (endsWithDb)
+            {
+                fullPathR = m_ReportApp.m_rstDataMgr.CurResultFile.FilePath + "\\" + str_libraryName;
+            }
+            else
+            {
+                fullPathR = m_ReportApp.m_rstDataMgr.CurResultFile.FilePath + "\\" + str_libraryName + ".db";
+			}
+               
 
 			ParticleData particleData = new ParticleData();
 			m_mbszclass.RuleGroup = particleData.ObtainParticleCategory_start(fullPathR);

OTSIncAReportApp/3-ServiceCenter/DataOperation/DataAccess/ParticleData.cs

@@ -991,6 +991,16 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
 			dataTable.Columns.Add("inoId");
 			dataTable.Columns.Add("display");
 			DataTable get_dt = SelectStandardLibraryGrouping(StandardLibraryAddress);
+            if (get_dt.Rows.Count==0)
+            {
+				DataRow data = dataTable.NewRow();
+				data["inoId"] = 0;
+				data["GroupId"] = 0;
+				data["GroupName"] = "Default";
+				data["display"] = "0";
+				dataTable.Rows.Add(data);
+				return dataTable;
+			}
 			DataRow[] dataRow = get_dt.Select("", "iorder ASC");
 			int shul = 0;
 			string DefaultGroupId = "";
@@ -1028,11 +1038,17 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
 		/// <returns></returns>
 		public List<DataTable> ObtainRuleData_start(DataTable strings, string a_SelectedIndex)
 		{
+			List<DataTable> List_data = new List<DataTable>();
 			DataTable dt_stl = new DataTable();
 			SqLiteHelper sh = new SqLiteHelper("data source='" + a_SelectedIndex + "'");
 			dt_stl = sh.ExecuteQuery("select * from ClassifySTD");
 			dt_stl.Columns.Add("display");
-			List<DataTable> List_data = new List<DataTable>();
+            if (dt_stl == null)
+            {
+                List_data.Add(dt_stl);
+				return List_data;
+			}
+			
 			for (int i = 0; i < strings.Rows.Count; i++)
 			{
 				DataTable table = dt_stl.Clone();