Просмотр исходного кода

去除报告导出的无效文件

zhangjiaxin 1 год назад
Родитель
Сommit
f081cb901d

+ 0 - 131
Bin/x64/Debug/Config/ReportTemplate/ReportTemplateConfig.xml

@@ -1,131 +0,0 @@
-<XmlConfig>
-  <M_SY>
-    <str_tb_ZBT>OTS Report</str_tb_ZBT>
-    <str_tb_FBT>XX有限公司</str_tb_FBT>
-    <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>GB30834</str_tb_CKBZ>
-    <b_ck_ypsm>True</b_ck_ypsm>
-    <b_ck_jggk>True</b_ck_jggk>
-    <str_bz>
-    </str_bz>
-    <str_xzkl>全部颗粒</str_xzkl>
-    <int_xzkl>0</int_xzkl>
-  </M_SY>
-  <M_YMYJ>
-    <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>
-  </M_YMYJ>
-  <M_KLFXJG>
-    <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
-    <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>
-    <index_cb_jzwfl_xstx>0</index_cb_jzwfl_xstx>
-    <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>ECD</str_cb_klcc_jsfs>
-    <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
-    <b_ck_klcc_dfl>False</b_ck_klcc_dfl>
-    <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
-  </M_KLFXJG>
-  <M_YSFXJG>
-    <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>
-    <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>
-    </list_str_tb_ysfx_xsys>
-    <b_ck_yscf_xsmk>True</b_ck_yscf_xsmk>
-    <index_cb_yscf_xstx>0</index_cb_yscf_xstx>
-    <index_cb_yscf_jsfs>0</index_cb_yscf_jsfs>
-    <index_cb_yscf_klfw>0</index_cb_yscf_klfw>
-    <str_tb_yscf_ysxx>H</str_tb_yscf_ysxx>
-    <list_str_tb_yscf_ysxx>
-      <YS0>H</YS0>
-    </list_str_tb_yscf_ysxx>
-  </M_YSFXJG>
-  <M_SYXT>
-    <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>
-    </list_lbv_syxt_mblb>
-    <list_lbv_syxt_mblb_index>
-      <MBIndex0>0</MBIndex0>
-      <MBIndex1>2</MBIndex1>
-    </list_lbv_syxt_mblb_index>
-  </M_SYXT>
-  <M_KLLBXX>
-    <b_ck_kllb_xsmk>True</b_ck_kllb_xsmk>
-    <index_cb_kllb_jsfs>0</index_cb_kllb_jsfs>
-    <index_cb_kllb_klfw>0</index_cb_kllb_klfw>
-    <int_tb_kllb_ylsx>1</int_tb_kllb_ylsx>
-    <str_tb_kllb_sxys>O,Al,Mg,Ca,Ti,Si,S,Mn</str_tb_kllb_sxys>
-    <list_str_tb_lllb_sxys>
-      <YS0>O</YS0>
-      <YS1>Al</YS1>
-      <YS2>Mg</YS2>
-      <YS3>Ca</YS3>
-      <YS4>Ti</YS4>
-      <YS5>Si</YS5>
-      <YS6>S</YS6>
-      <YS7>Mn</YS7>
-    </list_str_tb_lllb_sxys>
-    <b_ck_kllb_ystx>True</b_ck_kllb_ystx>
-    <b_ck_kllb_fdtx>False</b_ck_kllb_fdtx>
-    <b_ck_kllb_npxx>True</b_ck_kllb_npxx>
-    <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_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>
-      <YS1>Fe</YS1>
-    </list_str_kllb_qcys>
-    <str_kllb_qcys>C,Fe</str_kllb_qcys>
-    <str_kllb_DeleteClass>FeO,SiC</str_kllb_DeleteClass>
-    <list_str_kllb_DeleteClass>
-      <YS0>FeO</YS0>
-      <YS1>SiC</YS1>
-    </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>True</b_ck_surface>
-    <b_ck_chart>True</b_ck_chart>
-  </M_JZWZB>
-</XmlConfig>

+ 3 - 0
OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.cs

@@ -764,6 +764,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
             int ls = 0;
             DataTable REORDER_data = REORDER(a_datas[1], "Name");
+            if (REORDER_data.Rows.Count == 0)
+                return;
+
             for (int i = 0; i < REORDER_data.Rows.Count; i++)
             {
                 if (REORDER_data.Rows[i]["Name"].ToString() == "" || REORDER_data.Rows[i]["Name"].ToString() == null)