Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev

OTSIncAReportApp/FunctionClass/OTSTreeViewData/OTSTreeViewData.cs

@@ -239,7 +239,7 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
                     FindTreeWorkSampleNode(Tnode.Nodes[i], sWorkSampleName);
                 }
             }
-        }
+    }
 
         /// <summary>
         /// 递归遍历树节点,找到后,设置树节点的选中状态

OTSIncAReportApp/frmMeasureRstMgr.cs

@@ -384,7 +384,11 @@ namespace OTSIncAReportApp
 
             if (DialogResult.OK == MessageBox.Show(sDeleteSampleName, "Tip", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning))
             {
-                //删除样品成功
+                //删除当前选中的节点
+                TreeNode tvnode = treeView1.SelectedNode;
+                treeView1.Nodes.Remove(tvnode);
+
+                
                 //当节点全部删除完时刷新树以及主窗口的控件
                 if (treeView1.Nodes.Count == 0)
                 {

OTSIncAReportTemplate/OTSIncAReportTemplate.cs

@@ -61,7 +61,7 @@ namespace OTSIncAReportTemplate
             //}
 
             //方便测试代码分岐
-            bool bDebug = true;
+            bool bDebug = false;
             if (bDebug == false)
             {
                 m_arg1 = args[0].Replace("^", " ");
@@ -85,7 +85,7 @@ namespace OTSIncAReportTemplate
                 //m_arg4 = "0-983";
                 //m_arg5 = "";
 
-                m_arg1 = "E:\\ResultFile\\beijing20210708\\Sample4\\ReportTemplateDB.db";
+                m_arg1 = "D:\\夹杂物\\ReportTemplateDB.db";
                 m_arg2 = "./Config/ProData/ReportTemplateConfig.xml";
                 m_arg3 = "MainReport";
                 m_arg4 = "100";

OTSIncAReportTemplate/OTSIncAReportTemplate.csproj

@@ -94,8 +94,9 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.114.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.114.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.86.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Bin\x64\Debug\ReportTemplateExe\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.SQLite.EF6, Version=1.0.114.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Data.SQLite.EF6.1.0.114.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>

XMLData/AppResource_ZH.xml

@@ -189,6 +189,8 @@
       <Control name="AddSample" text="增加样品测量结果" />
       <Control name="button1" text="多选数据源" />
       <Control name="frmMeasureRstMgr" text="测量结果窗口" />
+	  <Control name="str1" text="是否确定删除 " />
+	  <Control name="str2" text="信息？" />
     </Controls>
  </Form>
  <Form>