修复报告程序多个样品，查看国标时切换失败的问题（c#部分代码），修复报告程序报告导出时颗粒列表显示与实际不一致的问题。

Bin/x64/Debug/Config/ProData/lj2.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="LiJi2" Sizes="0.1,0.5,1,3,5,9,12,20,30,40,50,60" Version="1.1.1" />
+<XMLData FileMark="626" Name="LiJi2" Sizes="0,0.5,1,2,5,30,100" Version="1.1.1" />

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

@@ -822,8 +822,8 @@
 	  <Control name="OriginalSplicing" text="Original splicing"/>
 	  <Control name="OriginalDistribution" text="Original distribution"/>
 	  <Control name="ParticleSizeTable" text="Particle size table"/>
-	  <Control name="ChineseStandard1" text="GB Function1(30834)"/>
-	  <Control name="ChineseStandard2" text="GB Function2(30834)"/>
+	  <Control name="ChineseStandard1" text="GB30834(10561)Function1"/>
+	  <Control name="ChineseStandard2" text="GB30834Function2"/>
 	  <Control name="AmericanStandard" text="American Standard"/>
 	  <Control name="GermanStandard" text="German standard"/>
 	  <Control name="CommonClassification" text="Common classification"/>

OTSCommon/Model/ResultFile.cs

@@ -24,6 +24,15 @@ namespace OTSCommon.Model
             get;
             set;
         }
+        /// <summary>
+        /// FileName
+        /// </summary>       
+        public string FileName_real
+        {
+            get;
+            set;
+        }
+
         /// <summary>
         /// FilePath
         /// </summary>       

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -712,8 +712,28 @@ namespace OTSIncAReportApp
                         case CALCULATE_TABLE_TYPE.GB_Method1:
                             //国标一
                             Cursor.Current = Cursors.WaitCursor;
-                            string resultfile = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
-                                + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
+
+                            string sou= m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+                            string resultfile = "";
+
+                            if (sou.Contains("+"))
+                            {
+                                ResultFile resultFile = m_ReportApp.m_rstDataMgr.ResultFilesList.Find(s => s.FileName == sou.Split('+')[0]);
+                                resultfile = resultFile.FilePath.ToString()+"\\"+ resultFile.FileName_real.ToString();
+                            }
+                            else
+                            {
+                                for (int i = 0; i < m_ReportApp.m_rstDataMgr.ResultFilesList.Count; i++)
+                                {
+                                    if (sou == m_ReportApp.m_rstDataMgr.ResultFilesList[i].FileName.ToString())
+                                        resultfile = m_ReportApp.m_rstDataMgr.ResultFilesList[i].FilePath.ToString()+"\\"+ m_ReportApp.m_rstDataMgr.ResultFilesList[i].FileName_real.ToString();
+                                }
+                            }
+
+
+
+                            //resultfile = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
+                            //    + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
 
                             m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile);
 
@@ -740,8 +760,27 @@ namespace OTSIncAReportApp
                         case CALCULATE_TABLE_TYPE.GB_Method2:
                             //国标二
                             Cursor.Current = Cursors.WaitCursor;
-                            string resultfile2 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
-                                 + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
+
+                            string sou2 = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+                            string resultfile2 = "";
+                            if (sou2.Contains("+"))
+                            {
+                                ResultFile resultFile = m_ReportApp.m_rstDataMgr.ResultFilesList.Find(s => s.FileName == sou2.Split('+')[0]);
+                                resultfile = resultFile.FilePath.ToString() + "\\" + resultFile.FileName_real.ToString();
+                            }
+                            else
+                            {
+                                for (int i = 0; i < m_ReportApp.m_rstDataMgr.ResultFilesList.Count; i++)
+                                {
+                                    if (sou2 == m_ReportApp.m_rstDataMgr.ResultFilesList[i].FileName.ToString())
+                                        resultfile2 = m_ReportApp.m_rstDataMgr.ResultFilesList[i].FilePath.ToString() + "\\" + m_ReportApp.m_rstDataMgr.ResultFilesList[i].FileName_real.ToString();
+                                }
+                            }
+
+
+
+                            //string resultfile2 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
+                            //     + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
 
                             m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile2);
 
@@ -763,8 +802,27 @@ namespace OTSIncAReportApp
                         case CALCULATE_TABLE_TYPE.ASTM:
                             //美标
                             Cursor.Current = Cursors.WaitCursor;
-                            string resultfile3 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
-                                + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
+
+
+                            string sou3 = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+                            string resultfile3 = "";
+                            if (sou3.Contains("+"))
+                            {
+                                ResultFile resultFile = m_ReportApp.m_rstDataMgr.ResultFilesList.Find(s => s.FileName == sou3.Split('+')[0]);
+                                resultfile = resultFile.FilePath.ToString() + "\\" + resultFile.FileName_real.ToString();
+                            }
+                            else
+                            {
+                                for (int i = 0; i < m_ReportApp.m_rstDataMgr.ResultFilesList.Count; i++)
+                                {
+                                    if (sou3 == m_ReportApp.m_rstDataMgr.ResultFilesList[i].FileName.ToString())
+                                        resultfile3 = m_ReportApp.m_rstDataMgr.ResultFilesList[i].FilePath.ToString() + "\\" + m_ReportApp.m_rstDataMgr.ResultFilesList[i].FileName_real.ToString();
+                                }
+                            }
+
+
+                            //string resultfile3 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
+                            //    + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
 
                             m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile3);
 
@@ -786,8 +844,25 @@ namespace OTSIncAReportApp
                         case CALCULATE_TABLE_TYPE.DIN:
                             //德标
                             Cursor.Current = Cursors.WaitCursor;
-                            string resultfile4 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
-                               + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
+
+                            string sou4 = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
+                            string resultfile4 = "";
+                            if (sou4.Contains("+"))
+                            {
+                                ResultFile resultFile = m_ReportApp.m_rstDataMgr.ResultFilesList.Find(s => s.FileName == sou4.Split('+')[0]);
+                                resultfile = resultFile.FilePath.ToString() + "\\" + resultFile.FileName_real.ToString();
+                            }
+                            else
+                            {
+                                for (int i = 0; i < m_ReportApp.m_rstDataMgr.ResultFilesList.Count; i++)
+                                {
+                                    if (sou4 == m_ReportApp.m_rstDataMgr.ResultFilesList[i].FileName.ToString())
+                                        resultfile4 = m_ReportApp.m_rstDataMgr.ResultFilesList[i].FilePath.ToString() + "\\" + m_ReportApp.m_rstDataMgr.ResultFilesList[i].FileName_real.ToString();
+                                }
+                            }
+
+                            //string resultfile4 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
+                            //   + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
 
                             m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile4);
 

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -242,7 +242,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
           
            
 
-            List<string> vs = new List<string>() { "DMAX", "DMIN", "Area", "FERET" };
+            List<string> vs = new List<string>() { "DMAX", "DMIN", "FERET", "CIRCLE" };
             string po = vs[m_otsreport_export.m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs];
 
             switch (po)

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -613,6 +613,9 @@ namespace OTSIncAReportApp
             //颗粒分析结果
             m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk = Convert.ToBoolean(xmlutil2.Read("M_KLFXJG", "b_ck_klcc_xsmk"));//是否显示模块
             m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs = Convert.ToInt32(xmlutil2.Read("M_KLFXJG", "index_cb_klcc_jsfs"));//计算方式
+
+            m_mbszclass.M_KLFXJG.str_cb_klcc_jsfs = xmlutil2.Read("M_KLFXJG", "str_cb_klcc_jsfs");//计算方式
+
             m_mbszclass.M_KLFXJG.index_cb_klcc_ljb = Convert.ToInt32(xmlutil2.Read("M_KLFXJG", "index_cb_klcc_ljb"));//粒级表
             m_mbszclass.M_KLFXJG.index_cb_klcc_klfw = Convert.ToInt32(xmlutil2.Read("M_KLFXJG", "index_cb_klcc_klfw"));//颗粒范围
             m_mbszclass.M_KLFXJG.b_cb_jzwfl_xsmk = Convert.ToBoolean(xmlutil2.Read("M_KLFXJG", "b_cb_jzwfl_xsmk"));//是否显示该模块

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs

@@ -435,6 +435,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 //颗粒分析结果
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk.ToString(), "M_KLFXJG", "b_ck_klcc_xsmk");//是否显示模块
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs.ToString(), "M_KLFXJG", "index_cb_klcc_jsfs");//计算方式
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_klcc_jsfs.ToString(), "M_KLFXJG", "str_cb_klcc_jsfs");//计算方式文本
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_klcc_ljb.ToString(), "M_KLFXJG", "index_cb_klcc_ljb");//粒级表
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_klcc_klfw.ToString(), "M_KLFXJG", "index_cb_klcc_klfw");//颗粒范围
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_cb_jzwfl_xsmk.ToString(), "M_KLFXJG", "b_cb_jzwfl_xsmk");//是否显示该模块

OTSIncAReportApp/2-CommonFunction/OTSDataMgrFunction/ResultDataMgr.cs

@@ -103,6 +103,7 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
             {
                 FileId = workingid.ToString(),
                 FileName = strname,
+                FileName_real=name,
                 FilePath = path,
                 ResultInfo = suggestions
             };

OTSIncAReportTemplate/OTSIncAReportTemplate.cs

@@ -189,6 +189,9 @@ namespace OTSIncAReportTemplate
 
             rmReport1.AddVariable("BZ", m_mbszclass.M_SY.str_bz, true);
 
+
+            rmReport1.AddVariable("M_KLFXJG", m_mbszclass.M_KLFXJG.str_cb_klcc_jsfs, true);
+            
             #region 判断是否显示
 
             DataTable ls_dt_AreaRatio = list_dt.Where(aa => aa.TableName.Contains("AreaRatio")).ToList()[0];
@@ -734,6 +737,7 @@ namespace OTSIncAReportTemplate
             //颗粒分析结果
             m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk = Convert.ToBoolean(xmlutil2.Read("M_KLFXJG", "b_ck_klcc_xsmk"));//是否显示模块
             m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs = Convert.ToInt32(xmlutil2.Read("M_KLFXJG", "index_cb_klcc_jsfs"));//计算方式
+            m_mbszclass.M_KLFXJG.str_cb_klcc_jsfs = xmlutil2.Read("M_KLFXJG", "str_cb_klcc_jsfs");//计算方式文本
             m_mbszclass.M_KLFXJG.index_cb_klcc_ljb = Convert.ToInt32(xmlutil2.Read("M_KLFXJG", "index_cb_klcc_ljb"));//粒级表
             m_mbszclass.M_KLFXJG.index_cb_klcc_klfw = Convert.ToInt32(xmlutil2.Read("M_KLFXJG", "index_cb_klcc_klfw"));//颗粒范围
             m_mbszclass.M_KLFXJG.b_cb_jzwfl_xsmk = Convert.ToBoolean(xmlutil2.Read("M_KLFXJG", "b_cb_jzwfl_xsmk"));//是否显示该模块