修改标准库启动查找路径以匹配多选的启动模式！

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData RunMode="ProfessionalMode" SysType="IncA">
-  <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="NoSTDDB" StdLibTypeIndex="0" SteelTechnology="0" UseSysSTD="true" />
+  <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="Baohuzha" StdLibTypeIndex="0" SteelTechnology="0" UseSysSTD="true" />
   <Member RegName="ImageProcParam" m_autoBGRemoveType="0" m_BGRemoveType="0">
     <Member RegName="BGGray" end="255" start="150" />
     <Member RegName="IncArea" end="100" start="5" />

OTSIncAMeasureApp/0-OTSModel/Measure/GetParamData/COTSMsrPrjResultData.cs

@@ -1219,6 +1219,15 @@ namespace OTSModelSharp
                 //int FindFileData = 0;
                 // int file = FindFirstFile(a_strFolderName, FindFileData);
                 string path = a_strFolderName;
+                if((int)m_nPackId== 1)
+                {
+                    path += "Cleanliness\\";
+                }
+                else if((int)m_nPackId == 0)
+                {
+                    path += "IncA\\";
+                }
+
                 List<string> lineStringList = new List<string>();//存储所有读取到的文件
                 DirectoryInfo[] dateDirArr = new DirectoryInfo(path).GetDirectories(); //取指定路径下的所有目录
 

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -99,7 +99,15 @@ namespace OTSMeasureApp
             IDC_COMBO_STDSelect.Items.Clear();
 
             string STDLibFolderName = m_cgenparam.GetPartSTDLibFolderName();
-            string[] files = System.IO.Directory.GetFiles(STDLibFolderName, "*.db");
+            if (m_cotsprogmgrparamfile.GetSysType() == "IncA")
+            {
+                STDLibFolderName += "IncA\\";
+            }
+            else
+            {
+                STDLibFolderName += "Cleanliness\\";
+            }
+            //string[] files = System.IO.Directory.GetFiles(STDLibFolderName, "*.db");
             System.IO.DirectoryInfo folder = new System.IO.DirectoryInfo(STDLibFolderName);
             foreach (System.IO.FileInfo file in folder.GetFiles("*.db"))
             {
@@ -982,13 +990,20 @@ namespace OTSMeasureApp
         #region 各按钮控件点击事件
         private void IDC_BUTTON_KLFX_Click(object sender, EventArgs e)
         {
-
-
             try
             {
                 if (IDC_COMBO_STDSelect.Text != "NoSTDDB")
                 {
-                    Process p = System.Diagnostics.Process.Start(".\\OTSPartA_STDEditor.exe", Application.StartupPath + "\\Config\\SysData\\" + IDC_COMBO_STDSelect.Text);
+                    string Currentpath = "\\Config\\SysData\\";
+                    if (m_cotsprogmgrparamfile.GetSysType() == "IncA")
+                    {
+                        Currentpath += "IncA\\";
+                    }
+                    else
+                    {
+                        Currentpath += "Cleanliness\\";
+                    }
+                    Process p = System.Diagnostics.Process.Start(".\\OTSPartA_STDEditor.exe", Application.StartupPath + Currentpath + IDC_COMBO_STDSelect.Text + ".db");
                     p.WaitForExit();
                 }
                 else

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -162,6 +162,7 @@ namespace OTSMeasureApp
                
                         m_SamplepaceWindow.InitStageDisplay(m_ProjData.GetStage(),m_ProjData.GetSEMStageData());
 
+                        //添加启动系统界面显示
                         this.Text += " -- SystemMode: " + m_ProjParam.m_DefaultParam.m_nPackId;
                     }
                     else
@@ -1138,7 +1139,16 @@ namespace OTSMeasureApp
         {
             OpenFileDialog openFileDialog = new OpenFileDialog();
             openFileDialog.Filter = "(*.db)|*.db";
-            openFileDialog.InitialDirectory = Application.StartupPath + "\\Config\\SysData\\";
+            string Currentpath = "\\Config\\SysData\\";
+            if (m_ProjParam.m_DefaultParam.m_nPackId.ToString() == "IncA")
+            {
+                Currentpath += "IncA\\";
+            }
+            else
+            {
+                Currentpath += "Cleanliness\\";
+            }
+            openFileDialog.InitialDirectory = Application.StartupPath + Currentpath;
             openFileDialog.RestoreDirectory = true;
             openFileDialog.FilterIndex = 1;
             if (openFileDialog.ShowDialog() == DialogResult.OK)

OTSIncAReportApp/frmMeasureRstMgr.cs

@@ -367,7 +367,7 @@ namespace OTSIncAReportApp
 
                 m_ReportApp.m_PropWindow.DisProperyWindow(SMeasureInfo);//刷新
             }
-
+            //添加启动系统界面显示
             string SystemMode = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)suggestions["Sample"])["Members"])["MsrParams"])["SysType"].ToString();
             m_ReportApp.Text = m_ReportApp.Text.Split(' ')[0] + " -- SystemMode: " + SystemMode;
         }

OTSPartA_STDEditor/OTSPartA_STDEditor.csproj

@@ -87,7 +87,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.108.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
+    <Reference Include="System.Data.SQLite, Version=1.0.115.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Bin\x64\Debug\System.Data.SQLite.dll</HintPath>
     </Reference>