|
@@ -38,18 +38,20 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
|
|
|
ParticleData fielddata = new ParticleData(m_otsreport_export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_otsreport_export.m_ReportApp.m_rstDataMgr.GetWorkingResultId()].FilePath);
|
|
|
DataTable btb = InvalidRemoval(fielddata.GetIncaSurfaceData(m_mbszclass.M_KLLBXX.list_str_kllb_qcys));
|
|
|
DataTable dt;
|
|
|
- if (m_mbszclass.list_str_MainPriority.Count == 0)
|
|
|
+
|
|
|
+ if (m_mbszclass.list_str_MainPriority_Serial.Count == 0)
|
|
|
{
|
|
|
dt = btb.Copy();
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+
|
|
|
dt = btb.Clone();
|
|
|
for (int i = 0; i < btb.Rows.Count; i++)
|
|
|
{
|
|
|
- for (int a = 0; a < m_mbszclass.list_str_MainPriority.Count; a++)
|
|
|
+ for (int a = 0; a < m_mbszclass.list_str_MainPriority_Serial.Count; a++)
|
|
|
{
|
|
|
- if (btb.Rows[i]["TypeName"].ToString() == m_mbszclass.list_str_MainPriority[a])
|
|
|
+ if (btb.Rows[i]["TypeId"].ToString() == m_mbszclass.list_str_MainPriority_Serial[a])
|
|
|
{
|
|
|
dt.Rows.Add(btb.Rows[i].ItemArray);
|
|
|
continue;
|
|
@@ -87,7 +89,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
|
|
|
{
|
|
|
for (int i = dt.Rows.Count - 1; i >= 0; i--)
|
|
|
{
|
|
|
- if (dt.Rows[i]["TypeName"].ToString() == m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass[a].ToString())
|
|
|
+ if (dt.Rows[i]["TypeId"].ToString() == m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass[a].ToString())
|
|
|
{
|
|
|
dt.Rows.RemoveAt(i);
|
|
|
}
|
|
@@ -98,18 +100,19 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
|
|
|
for (int i=0;i< dt.Rows.Count;i++)
|
|
|
{
|
|
|
|
|
|
- for (int a=0;a< m_mbszclass.list_str_MainPriority.Count;a++)
|
|
|
+ for (int a=0;a< m_mbszclass.list_str_MainPriority_Serial.Count;a++)
|
|
|
{
|
|
|
- if (m_mbszclass.list_str_MainPriority[a].ToString()== dt.Rows[i]["TypeName"].ToString())
|
|
|
+ if (m_mbszclass.list_str_MainPriority_Serial[a].ToString()== dt.Rows[i]["TypeId"].ToString())
|
|
|
{
|
|
|
PriorityOne.Rows.Add(dt.Rows[i].ItemArray);
|
|
|
-
|
|
|
+ continue;
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
}
|
|
|
DataTable dt_ParticlesGridDevidePage;
|
|
|
- if (m_mbszclass.list_str_MainPriority.Count!=0)
|
|
|
+ if (m_mbszclass.list_str_MainPriority_Serial.Count!=0)
|
|
|
{
|
|
|
dt_ParticlesGridDevidePage = dt.Clone();
|
|
|
DataView dvs = PriorityOne.DefaultView;
|