Prechádzať zdrojové kódy

修改报告导出bug

cxs 1 rok pred
rodič
commit
13bee9ae6a

+ 1 - 1
Bin/x64/Debug/Config/ReportTemplate/ReportTemplateConfig.xml

@@ -120,7 +120,7 @@
     <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
-    <Path>C:\Others\Opton\cleanness\OTS\Bin\x64\Debug\Config\ConfigTemplate\IncA\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>False</b_ck_surface>

+ 33 - 0
OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -1809,6 +1809,39 @@ namespace OTSIncAReportApp
                 //m_mbszclass.M_KLLBXX.str_cb_kllb_chartSort_p3 = Convert.ToString(xmlutil.Read("M_KLLBXX", "str_cb_kllb_chartSort_p3"));//帧图表列中第三个可选参数
                 //m_mbszclass.M_KLLBXX.index_cb_kllb_chartSort_p3 = Convert.ToInt32(xmlutil.Read("M_KLLBXX", "index_cb_kllb_chartSort_p3"));
                 m_mbszclass.M_KLLBXX.list_int_kllb_number= Convert.ToInt32(xmlutil.Read("M_KLLBXX", "list_int_kllb_number"));//保存显示颗粒数量
+
+                m_mbszclass.M_KLLBXX.str_kllb_qcys = Convert.ToString(xmlutil.Read("M_KLLBXX", "str_kllb_qcys"));
+                m_mbszclass.M_KLLBXX.list_str_kllb_qcys.Clear();
+                for (int i = 0; i < 100; i++)                              //取得所有元素列表
+                {
+                    string str = xmlutil.Read("M_KLLBXX", "list_str_kllb_qcys", "YS" + i.ToString());
+                    if (str == null)
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        m_mbszclass.M_KLLBXX.list_str_kllb_qcys.Add(str);
+                    }
+                }
+                m_mbszclass.M_KLLBXX.str_kllb_DeleteClass = Convert.ToString(xmlutil.Read("M_KLLBXX", "str_kllb_DeleteClass"));
+                m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Clear();
+                for (int i = 0; i < 100; i++)                              //取得所有元素列表
+                {
+                    string str = xmlutil.Read("M_KLLBXX", "list_str_kllb_DeleteClass", "YS" + i.ToString());
+                    if (str == null)
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Add(str);
+                    }
+                }
+
+                //夹杂物占比
+                m_mbszclass.M_JZWZB.b_ck_surface = Convert.ToBoolean(xmlutil.Read("M_JZWZB", "b_ck_surface"));//夹杂物占比表
+                m_mbszclass.M_JZWZB.b_ck_chart = Convert.ToBoolean(xmlutil.Read("M_JZWZB", "b_ck_chart"));//夹杂物占比图
             }
         }