更新各版本导出报告模板

Bin/x64/Debug/Config/ConfigTemplate/BatteryCleannessA/ReportTemplateConfig.xml

@@ -1,7 +1,7 @@
 <XmlConfig>
   <M_SY>
     <str_tb_ZBT>Cleanness Report</str_tb_ZBT>
-    <str_tb_FBT>宁德时代</str_tb_FBT>
+    <str_tb_FBT>XXX有限公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
     <str_tb_CKBZ>
     </str_tb_CKBZ>
@@ -29,6 +29,9 @@
     <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
     <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
     <str_cb_klcc_jsfs>CIRCLE</str_cb_klcc_jsfs>
+    <b_ck_klcc_xsddt>True</b_ck_klcc_xsddt>
+    <b_ck_klcc_dfl>True</b_ck_klcc_dfl>
+    <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
   </M_KLFXJG>
   <M_YSFXJG>
     <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
@@ -108,13 +111,14 @@
     <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
     <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
+      <YS0>C</YS0>
     </list_str_kllb_qcys>
-    <str_kllb_qcys>
-    </str_kllb_qcys>
+    <str_kllb_qcys>C</str_kllb_qcys>
     <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
       <YS0>misc</YS0>
     </list_str_kllb_DeleteClass>
+    <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>

Bin/x64/Debug/Config/ConfigTemplate/CleannessA/ReportTemplateConfig.xml

@@ -1,10 +1,9 @@
 <XmlConfig>
   <M_SY>
     <str_tb_ZBT>Cleanness Report</str_tb_ZBT>
-    <str_tb_FBT>宁德时代</str_tb_FBT>
+    <str_tb_FBT>XXXXXX有限公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>
-    </str_tb_CKBZ>
+    <str_tb_CKBZ>VDA19</str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
     <str_bz>
@@ -13,7 +12,7 @@
     <int_xzkl>0</int_xzkl>
   </M_SY>
   <M_YMYJ>
-    <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
+    <str_tb_ymwb>清洁度分析报告</str_tb_ymwb>
     <str_tb_KHH>Copi0000123012</str_tb_KHH>
     <b_ck_ym>True</b_ck_ym>
     <str_tb_yjwb>OTS Result</str_tb_yjwb>
@@ -29,9 +28,12 @@
     <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
     <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
     <str_cb_klcc_jsfs>CIRCLE</str_cb_klcc_jsfs>
+    <b_ck_klcc_xsddt>True</b_ck_klcc_xsddt>
+    <b_ck_klcc_dfl>True</b_ck_klcc_dfl>
+    <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
   </M_KLFXJG>
   <M_YSFXJG>
-    <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
+    <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
     <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
     <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
     <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
@@ -95,26 +97,27 @@
     <str_cb_kllb_sort>Hardness</str_cb_kllb_sort>
     <index_cb_kllb_sort>2</index_cb_kllb_sort>
     <index_cb_kllb_sort_p1>1</index_cb_kllb_sort_p1>
-    <str_cb_kllb_sort_p2>Area</str_cb_kllb_sort_p2>
-    <index_cb_kllb_sort_p2>0</index_cb_kllb_sort_p2>
-    <str_cb_kllb_sort_p3>AveGray</str_cb_kllb_sort_p3>
-    <index_cb_kllb_sort_p3>3</index_cb_kllb_sort_p3>
-    <str_cb_kllb_chartSort_p1>Area</str_cb_kllb_chartSort_p1>
-    <index_cb_kllb_chartSort_p1>0</index_cb_kllb_chartSort_p1>
-    <str_cb_kllb_chartSort_p2>DMAX</str_cb_kllb_chartSort_p2>
-    <index_cb_kllb_chartSort_p2>1</index_cb_kllb_chartSort_p2>
+    <str_cb_kllb_sort_p2>Hardness</str_cb_kllb_sort_p2>
+    <index_cb_kllb_sort_p2>2</index_cb_kllb_sort_p2>
+    <str_cb_kllb_sort_p3>Area</str_cb_kllb_sort_p3>
+    <index_cb_kllb_sort_p3>0</index_cb_kllb_sort_p3>
+    <str_cb_kllb_chartSort_p1>Hardness</str_cb_kllb_chartSort_p1>
+    <index_cb_kllb_chartSort_p1>2</index_cb_kllb_chartSort_p1>
+    <str_cb_kllb_chartSort_p2>Area</str_cb_kllb_chartSort_p2>
+    <index_cb_kllb_chartSort_p2>0</index_cb_kllb_chartSort_p2>
     <str_cb_kllb_chartSort_p3>AveGray</str_cb_kllb_chartSort_p3>
     <index_cb_kllb_chartSort_p3>3</index_cb_kllb_chartSort_p3>
     <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
     <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
+      <YS0>C</YS0>
     </list_str_kllb_qcys>
-    <str_kllb_qcys>
-    </str_kllb_qcys>
+    <str_kllb_qcys>C</str_kllb_qcys>
     <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
       <YS0>misc</YS0>
     </list_str_kllb_DeleteClass>
+    <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>

Bin/x64/Debug/Config/ConfigTemplate/IncA/ReportTemplateConfig.xml

@@ -1,10 +1,9 @@
 <XmlConfig>
   <M_SY>
-    <str_tb_ZBT>Cleanness Report</str_tb_ZBT>
-    <str_tb_FBT>宁德时代</str_tb_FBT>
+    <str_tb_ZBT>IncA Report</str_tb_ZBT>
+    <str_tb_FBT>XXX有限公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>
-    </str_tb_CKBZ>
+    <str_tb_CKBZ>GB30834</str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
     <str_bz>
@@ -13,7 +12,7 @@
     <int_xzkl>0</int_xzkl>
   </M_SY>
   <M_YMYJ>
-    <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
+    <str_tb_ymwb>OTS夹杂物分析报告</str_tb_ymwb>
     <str_tb_KHH>Copi0000123012</str_tb_KHH>
     <b_ck_ym>True</b_ck_ym>
     <str_tb_yjwb>OTS Result</str_tb_yjwb>
@@ -29,26 +28,61 @@
     <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
     <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
     <str_cb_klcc_jsfs>CIRCLE</str_cb_klcc_jsfs>
+    <b_ck_klcc_xsddt>True</b_ck_klcc_xsddt>
+    <b_ck_klcc_dfl>True</b_ck_klcc_dfl>
+    <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
   </M_KLFXJG>
   <M_YSFXJG>
-    <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
+    <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
     <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
     <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
-    <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
+    <str_tb_ysfx_xsys>Al,Si,B,P,C,S,N,Cl,O,F,Te,Se,Pb,Sn,Hg,W,Mo,Cr,I,Br,Bi,As,Zr,Ti,Ni,Nd,Re,Mn,Ba,Ca,Cu,Ce,Ta,Nb,Sm,V,Co,Ac,La,Y,Cs,Mg,Be,Li,H</str_tb_ysfx_xsys>
     <list_str_tb_ysfx_xsys>
       <YS0>Al</YS0>
       <YS1>Si</YS1>
-      <YS2>C</YS2>
-      <YS3>S</YS3>
-      <YS4>N</YS4>
-      <YS5>O</YS5>
-      <YS6>Fe</YS6>
-      <YS7>Ti</YS7>
-      <YS8>Mn</YS8>
-      <YS9>Mg</YS9>
-      <YS10>Ca</YS10>
-      <YS11>Ce</YS11>
-      <YS12>La</YS12>
+      <YS2>B</YS2>
+      <YS3>P</YS3>
+      <YS4>C</YS4>
+      <YS5>S</YS5>
+      <YS6>N</YS6>
+      <YS7>Cl</YS7>
+      <YS8>O</YS8>
+      <YS9>F</YS9>
+      <YS10>Te</YS10>
+      <YS11>Se</YS11>
+      <YS12>Pb</YS12>
+      <YS13>Sn</YS13>
+      <YS14>Hg</YS14>
+      <YS15>W</YS15>
+      <YS16>Mo</YS16>
+      <YS17>Cr</YS17>
+      <YS18>I</YS18>
+      <YS19>Br</YS19>
+      <YS20>Bi</YS20>
+      <YS21>As</YS21>
+      <YS22>Zr</YS22>
+      <YS23>Ti</YS23>
+      <YS24>Ni</YS24>
+      <YS25>Nd</YS25>
+      <YS26>Re</YS26>
+      <YS27>Mn</YS27>
+      <YS28>Ba</YS28>
+      <YS29>Ca</YS29>
+      <YS30>Cu</YS30>
+      <YS31>Ce</YS31>
+      <YS32>Ta</YS32>
+      <YS33>Nb</YS33>
+      <YS34>Sm</YS34>
+      <YS35>V</YS35>
+      <YS36>Co</YS36>
+      <YS37>Ac</YS37>
+      <YS38>La</YS38>
+      <YS39>Y</YS39>
+      <YS40>Cs</YS40>
+      <YS41>Mg</YS41>
+      <YS42>Be</YS42>
+      <YS43>Li</YS43>
+      <YS44>H</YS44>
     </list_str_tb_ysfx_xsys>
     <b_ck_yscf_xsmk>True</b_ck_yscf_xsmk>
     <index_cb_yscf_xstx>0</index_cb_yscf_xstx>
@@ -60,17 +94,25 @@
     </list_str_tb_yscf_ysxx>
   </M_YSFXJG>
   <M_SYXT>
-    <b_ck_syxt_xsmk>False</b_ck_syxt_xsmk>
+    <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
     <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
     <list_lbv_syxt_mblb>
       <MB0>MgO.CaO.Al₂O₃</MB0>
       <MB1>CaO.SiO₂.Al₂O₃</MB1>
+      <MB2>MnO.S.Al₂O₃</MB2>
+      <MB3>CaO.TiN.Al₂O₃</MB3>
+      <MB4>CaO.CaS.Al₂O₃</MB4>
+      <MB5>MnS.CaS.Al₂O₃</MB5>
     </list_lbv_syxt_mblb>
     <list_lbv_syxt_mblb_index>
       <MBIndex0>0</MBIndex0>
       <MBIndex1>2</MBIndex1>
+      <MBIndex2>3</MBIndex2>
+      <MBIndex3>4</MBIndex3>
+      <MBIndex4>6</MBIndex4>
+      <MBIndex5>7</MBIndex5>
     </list_lbv_syxt_mblb_index>
   </M_SYXT>
   <M_KLLBXX>
@@ -108,19 +150,21 @@
     <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
     <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
+      <YS0>C</YS0>
+      <YS1>Fe</YS1>
     </list_str_kllb_qcys>
-    <str_kllb_qcys>
-    </str_kllb_qcys>
+    <str_kllb_qcys>C,Fe</str_kllb_qcys>
     <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
       <YS0>misc</YS0>
     </list_str_kllb_DeleteClass>
+    <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
   </M_address>
   <M_JZWZB>
-    <b_ck_surface>False</b_ck_surface>
-    <b_ck_chart>False</b_ck_chart>
+    <b_ck_surface>True</b_ck_surface>
+    <b_ck_chart>True</b_ck_chart>
   </M_JZWZB>
 </XmlConfig>

Bin/x64/Debug/Config/ReportTemplate/ReportTemplateConfig.xml

@@ -1,11 +1,9 @@
 <XmlConfig>
   <M_SY>
-    <str_tb_ZBT>夹杂物报告</str_tb_ZBT>
-    <str_tb_FBT>
-    </str_tb_FBT>
+    <str_tb_ZBT>Cleanness Report</str_tb_ZBT>
+    <str_tb_FBT>XXXXXX有限公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>
-    </str_tb_CKBZ>
+    <str_tb_CKBZ>VDA19</str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
     <str_bz>
@@ -14,15 +12,14 @@
     <int_xzkl>0</int_xzkl>
   </M_SY>
   <M_YMYJ>
-    <str_tb_ymwb>夹杂物分析报告</str_tb_ymwb>
+    <str_tb_ymwb>清洁度分析报告</str_tb_ymwb>
     <str_tb_KHH>Copi0000123012</str_tb_KHH>
     <b_ck_ym>True</b_ck_ym>
-    <str_tb_yjwb>
-    </str_tb_yjwb>
+    <str_tb_yjwb>OTS Result</str_tb_yjwb>
   </M_YMYJ>
   <M_KLFXJG>
     <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
-    <index_cb_klcc_jsfs>0</index_cb_klcc_jsfs>
+    <index_cb_klcc_jsfs>3</index_cb_klcc_jsfs>
     <index_cb_klcc_ljb>0</index_cb_klcc_ljb>
     <index_cb_klcc_klfw>0</index_cb_klcc_klfw>
     <b_cb_jzwfl_xsmk>True</b_cb_jzwfl_xsmk>
@@ -30,10 +27,10 @@
     <index_cb_jzwfl_jsfs>0</index_cb_jzwfl_jsfs>
     <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
     <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
-    <str_cb_klcc_jsfs>DMAX</str_cb_klcc_jsfs>
+    <str_cb_klcc_jsfs>CIRCLE</str_cb_klcc_jsfs>
+    <b_ck_klcc_xsddt>True</b_ck_klcc_xsddt>
     <b_ck_klcc_dfl>True</b_ck_klcc_dfl>
     <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
-    <b_ck_klcc_xsddt>True</b_ck_klcc_xsddt>
   </M_KLFXJG>
   <M_YSFXJG>
     <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
@@ -100,22 +97,22 @@
     <str_cb_kllb_sort>Hardness</str_cb_kllb_sort>
     <index_cb_kllb_sort>2</index_cb_kllb_sort>
     <index_cb_kllb_sort_p1>1</index_cb_kllb_sort_p1>
-    <str_cb_kllb_sort_p2>Area</str_cb_kllb_sort_p2>
-    <index_cb_kllb_sort_p2>0</index_cb_kllb_sort_p2>
-    <str_cb_kllb_sort_p3>AveGray</str_cb_kllb_sort_p3>
-    <index_cb_kllb_sort_p3>3</index_cb_kllb_sort_p3>
-    <str_cb_kllb_chartSort_p1>Area</str_cb_kllb_chartSort_p1>
-    <index_cb_kllb_chartSort_p1>0</index_cb_kllb_chartSort_p1>
-    <str_cb_kllb_chartSort_p2>DMAX</str_cb_kllb_chartSort_p2>
-    <index_cb_kllb_chartSort_p2>1</index_cb_kllb_chartSort_p2>
+    <str_cb_kllb_sort_p2>Hardness</str_cb_kllb_sort_p2>
+    <index_cb_kllb_sort_p2>2</index_cb_kllb_sort_p2>
+    <str_cb_kllb_sort_p3>Area</str_cb_kllb_sort_p3>
+    <index_cb_kllb_sort_p3>0</index_cb_kllb_sort_p3>
+    <str_cb_kllb_chartSort_p1>Hardness</str_cb_kllb_chartSort_p1>
+    <index_cb_kllb_chartSort_p1>2</index_cb_kllb_chartSort_p1>
+    <str_cb_kllb_chartSort_p2>Area</str_cb_kllb_chartSort_p2>
+    <index_cb_kllb_chartSort_p2>0</index_cb_kllb_chartSort_p2>
     <str_cb_kllb_chartSort_p3>AveGray</str_cb_kllb_chartSort_p3>
     <index_cb_kllb_chartSort_p3>3</index_cb_kllb_chartSort_p3>
     <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
     <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
+      <YS0>C</YS0>
     </list_str_kllb_qcys>
-    <str_kllb_qcys>
-    </str_kllb_qcys>
+    <str_kllb_qcys>C</str_kllb_qcys>
     <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
       <YS0>misc</YS0>
@@ -123,10 +120,10 @@
     <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
-    <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
+    <Path>C:\Others\Opton\cleanness\OTS\Bin\x64\Debug\Config\ConfigTemplate\BatteryCleannessA\ReportTemplateConfig.xml</Path>
   </M_address>
   <M_JZWZB>
-    <b_ck_surface>True</b_ck_surface>
+    <b_ck_surface>False</b_ck_surface>
     <b_ck_chart>False</b_ck_chart>
   </M_JZWZB>
 </XmlConfig>

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -169,8 +169,13 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         }
         #endregion
         #region 读取标准库所需要的数据
-        private void GetSTL(string str ,out DataTable  data)
+        private bool GetSTL(string str ,out DataTable  data)
         {
+            if (str.ToLower() == "nostddb")
+            {
+                data = null;
+                return false;
+            }
             DataTable dt = new DataTable();
             dt.Columns.Add("TypeId");
             dt.Columns.Add("Hardness", typeof(double));
@@ -178,7 +183,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             
             
             OTSCommon.SqLiteHelper sh = null;
-            string fullPath = m_otsreport_export.m_ReportApp.m_rstDataMgr.CurResultFile.FilePath + str + ".db";
+            string fullPath = m_otsreport_export.m_ReportApp.m_rstDataMgr.CurResultFile.FilePath + "\\" + str + ".db";
             string fullPath2 = System.IO.Directory.GetCurrentDirectory() + "\\Config\\SysData\\" + str + ".db";
             if (System.IO.File.Exists(fullPath))
             {
@@ -192,7 +197,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             {
                 sh = null;
                 data = null;
-                return;
+                return false;
             }
 
             DataTable dt_stl= sh.ExecuteQuery("select * from ClassifySTD");
@@ -220,6 +225,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 dt.Rows.Add(dr);
             }
             data = dt;
+            return true;
         }
         public bool GetDBData(c_TemplateClass m_mbszclass)
         {
@@ -426,28 +432,6 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         #endregion
 
         #region 插入颗粒列表并带有帧图
-        private bool DoesDBexist()
-        {
-            try
-            {
-                ResultFile resfile = m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.getSelectedIndex()];
-                //string str_libraryName = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString();
-                string str_libraryName = resfile.GetSTDName();
-                OTSCommon.SqLiteHelper sh = new OTSCommon.SqLiteHelper("data source='" + System.IO.Directory.GetCurrentDirectory() + "\\Config\\SysData\\" + str_libraryName + ".db" + "'");
-                
-                if (sh.ExecuteQuery("select * from ClassifySTD")==null)
-                {
-                    return false;
-                }
-                return true;
-            }
-            catch 
-            {
-                return false;
-               
-            }
-            
-        }
         private string datatable_data(DataTable dt,int it,string str)
         {
             if (str == "Hardness")
@@ -961,14 +945,13 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             ResultFile resfile = m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.getSelectedIndex()];
             //string str_libraryName = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString();
             string str_libraryName = resfile.GetSTDName();
-            if (m_mbszclass.M_KLLBXX.str_cb_kllb_sort_p1.ToString() == "Hardness")
+            if (m_otsreport_export.m_ReportApp.m_RptConfigFile.Systype == OTS_SysType_ID.CleannessA)
             {
                 dt.Columns.Add("Hardness", typeof(double));
                 dt.Columns.Add("Hardness_detailed");
-                if (DoesDBexist())
+                DataTable dt_stl = new DataTable();
+                if (GetSTL(str_libraryName, out dt_stl))
                 {
-                    DataTable dt_stl = new DataTable();
-                    GetSTL(str_libraryName, out dt_stl);
                     for (int i = 0; i < dt.Rows.Count; i++)
                     {
                         for (int a = 0; a < dt_stl.Rows.Count; a++)
@@ -982,7 +965,6 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                         }
                     }
                 }
-
             }
 
             //去除物质分类（非夹杂物分类）
@@ -1221,14 +1203,13 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             //string str_libraryName = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString();
 
             string str_libraryName = resfile.GetSTDName();
-            if (m_mbszclass.M_KLLBXX.str_cb_kllb_sort_p1.ToString() == "Hardness")
+            if (m_otsreport_export.m_ReportApp.m_RptConfigFile.Systype == OTS_SysType_ID.CleannessA)
             {
                 dt.Columns.Add("Hardness", typeof(double));
                 dt.Columns.Add("Hardness_detailed");
-                if (DoesDBexist())
+                DataTable dt_stl = new DataTable();
+                if (GetSTL(str_libraryName, out dt_stl))
                 {
-                    DataTable dt_stl = new DataTable();
-                    GetSTL(str_libraryName, out dt_stl);
                     for (int i = 0; i < dt.Rows.Count; i++)
                     {
                         for (int a = 0; a < dt_stl.Rows.Count; a++)

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

@@ -799,6 +799,11 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             {
                 libraryName += ".db";
             }
+            if(libraryName.ToLower()== "nostddb.db")
+            {
+                dbHelper = null;
+                log.Error("Failed to load user-defined library" + "!");
+            }
             string fullPath = resultpath + libraryName;
             string fullPath2 = System.IO.Directory.GetCurrentDirectory() + "\\Config\\SysData\\" + libraryName;
             if (System.IO.File.Exists(fullPath))