Merge branch 'release2.31' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into release2.31

Bin/x64/Debug/Config/ProData/DefaultTriTemplateFile.tpf

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData Name="TriangulationTemplate" Version="1.3.1">
-  <Member TemplateId="1" TemplateName="MgO.CaO.Al2O3" Element="Mg.Ca,Na.Al" Group="MgO-Mg.CaO-Ca,Na.Al2O3-Al" />
-  <Member TemplateId="2" TemplateName="CaO.S.Al2O3" Element="Ca.S.Al" Group="CaO-Ca.S-S.Al2O3-Al" />
-  <Member TemplateId="3" TemplateName="CaO.SiO2.Al2O3" Element="Ca.Si.Al" Group="CaO-Ca.SiO2-Si.Al2O3-Al" />
-  <Member TemplateId="4" TemplateName="MnO.S.Al2O3" Element="Mn.S.Al" Group="MnO-Mn.S-S.Al2O3-Al" />
-  <Member TemplateId="5" TemplateName="CaO.TiN.Al2O3" Element="Ca.Ti.Al" Group="CaO-Ca.TiN-Ti.Al2O3-Al" />
-  <Member TemplateId="6" TemplateName="Mn.Ni.Co" Element=".Ni." Group="Mn-.Ni-Ni.Co-" />
-  <Member TemplateId="20210913145438" TemplateName="CaO.CaS.Al2O3" Element="Ca.S,Ca.Al" Group="CaO-Ca.CaS-S,Ca.Al2O3-Al" />
-  <Member TemplateId="20211223164219" TemplateName="MnS.CaS.Al2O3" Element="Mn.Ca.Al" Group="MnS-Mn.CaS-Ca.Al2O3-Al" />
+  <Member TemplateId="1" TemplateName="MgO.CaO.Al₂O₃" Element="Mg.Ca,Na.Al" Group="MgO-Mg.CaO-Ca,Na.Al₂O₃-Al" />
+  <Member TemplateId="2" TemplateName="CaO.S.Al₂O₃" Element="Ca.S.Al" Group="CaO-Ca.S-S.Al₂O₃-Al" />
+  <Member TemplateId="3" TemplateName="CaO.SiO₂.Al₂O₃" Element="Ca.Si.Al" Group="CaO-Ca.SiO₂-Si.Al₂O₃-Al" />
+  <Member TemplateId="4" TemplateName="MnO.S.Al₂O₃" Element="Mn.S.Al" Group="MnO-Mn.S-S.Al₂O₃-Al" />
+  <Member TemplateId="5" TemplateName="CaO.TiN.Al₂O₃" Element="Ca.Ti.Al" Group="CaO-Ca.TiN-Ti.Al₂O₃-Al" />
+  <Member TemplateId="6" TemplateName="Mn.Ni.Co" Element="Ac.Ni.Ac" Group="Mn-Ac.Ni-Ni.Co-Ac" />
+  <Member TemplateId="20210913145438" TemplateName="CaO.CaS.Al₂O₃" Element="Ca.S,Ca.Al" Group="CaO-Ca.CaS-S,Ca.Al₂O₃-Al" />
+  <Member TemplateId="20211223164219" TemplateName="MnS.CaS.Al₂O₃" Element="Mn.Ca.Al" Group="MnS-Mn.CaS-Ca.Al₂O₃-Al" />
 </XMLData>

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -79,7 +79,7 @@ namespace OTSIncAReportGrids
         Hashtable table;
         //测量结果
         ResultFile result = null;
-
+        string str_SysType = "";//当前启动模式（夹杂物、清洁度）
         frmReportConditionChoose m_condition;
         FieldData fieldData;
 		DataTable particlesAll;
@@ -215,15 +215,23 @@ namespace OTSIncAReportGrids
                 //m_frm_userprogress = new Frm_UserProgress();
                 fieldData = new FieldData(result.FilePath);
                 Particledata = new ParticleData(result.FilePath);
-                string str_libraryName = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString();
-                userLibrary = new UserLibraryData(str_libraryName);
-                if(userLibrary!=null)
+                str_SysType = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"])["MsrParams"])["SysType"].ToString();
+                if (str_SysType== "0:IncA")
                 {
-                    userLibraryData = userLibrary.GetSubAttributeFromDatabase();
+                    userLibraryData = null;
                 }
                 else
                 {
-                    userLibraryData = null;
+                    string str_libraryName = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString();
+                    userLibrary = new UserLibraryData(str_libraryName);
+                    if (userLibrary.GetSqlHelper() != null)
+                    {
+                        userLibraryData = userLibrary.GetSubAttributeFromDatabase();
+                    }
+                    else
+                    {
+                        userLibraryData = null;
+                    }
                 }
                 //初始化底层操作类
                 m_OTSIncAReportGridsFun = new OTSReportGridsFun(m_ReportApp, this);
@@ -377,12 +385,12 @@ namespace OTSIncAReportGrids
                 }
                 if (sel == 0)
                 {
-                    string str = "TypeId <> -1 and TypeId <> 9";
+                    string str = "TypeId <> -1 and TypeId <> 9 and TypeId <> 0";
                     particlesAll = SreeenDataTable(particlesAll, str);
                 }
                 if (sel == 2)
                 {
-                    string str = "TypeId = " + "-1 or TypeId =" + "9";
+                    string str = "TypeId = " + "-1 or TypeId =" + "9 or TypeId =" + "0";
                     particlesAll = SreeenDataTable(particlesAll, str);
                 }
                 btn_Sel.Enabled = true;
@@ -591,7 +599,6 @@ namespace OTSIncAReportGrids
 
             dgV_ParticlesDevidePage.Rows.Clear();
             dgV_ParticlesDevidePage.Columns.Clear();
-            string startFun = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)result.ResultInfo["Sample"])["Members"])["MsrParams"])["SysType"].ToString();
             //从报告xml文件中加载,显示计算列，显示元素信息
             string str_DefaultComputedColName = "", str_ElementsColName = "";
             DataSet ds = OTSIncAReportApp.DataOperation.DataAccess.XMLoperate.GetXmlData(Application.StartupPath + m_ReportApp.m_OTSReportMgrParamFile, "XMLData");
@@ -677,7 +684,7 @@ namespace OTSIncAReportGrids
                 {
                     keyValues.Add("ORIENTATION", table["str33"].ToString());
                 }
-                if (startFun == "1:CleannessA")
+                if (str_SysType == "1:CleannessA")
                 {
                     if (strs[i] == "Hardness")
                     {

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

@@ -658,5 +658,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             DT = dbHelper.ExecuteQuery(sqliteString);
             return DT;
         }
+
+        public SqlHelper GetSqlHelper() { return dbHelper; }
     }
 }