|
@@ -359,26 +359,15 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
|
|
|
{
|
|
|
m_OTSReport_Export.m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add(after[i]);
|
|
|
}
|
|
|
- //拆分,物质分类
|
|
|
- //m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Clear();
|
|
|
- //for (int i = 0; i < delete_Class.Text.Split(',').Length; i++)
|
|
|
- //{
|
|
|
- // if (delete_Class.Text.Split(',')[i] != "")
|
|
|
- // m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Add(delete_Class.Text.Split(',')[i]);
|
|
|
- //}
|
|
|
+
|
|
|
//主要优先显示
|
|
|
m_OTSReport_Export.m_mbszclass.list_str_MainPriority.Clear();
|
|
|
m_OTSReport_Export.m_mbszclass.list_str_MainPriority = list_MainPriority.Copy();
|
|
|
- //string[] MainPriority = textBox_zypxss.Text.Split(new char[] { '/' });
|
|
|
- //for (int i = 0; i < MainPriority.Length; i++)
|
|
|
- //{
|
|
|
- // if (textBox_zypxss.Text.Split('/')[i] != "")
|
|
|
- // m_OTSReport_Export.m_mbszclass.list_str_MainPriority.Add(MainPriority[i]);
|
|
|
- //}
|
|
|
+
|
|
|
|
|
|
//主要优先显示顺序
|
|
|
m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial.Clear();
|
|
|
- m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial= TCCleannessAList;
|
|
|
+ m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial= TCCleannessAList.Copy();
|
|
|
|
|
|
|
|
|
|
|
@@ -474,7 +463,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
|
|
|
|
|
|
|
|
|
textBox1.Text = m_OTSReport_Export.m_mbszclass.M_DZ.Notes;
|
|
|
- TCCleannessAList = m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial;
|
|
|
+ TCCleannessAList = m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial.Copy();
|
|
|
+ list_MainPriority = m_OTSReport_Export.m_mbszclass.list_str_MainPriority.Copy();
|
|
|
LoadingIcon();
|
|
|
}
|
|
|
private void LoadingIcon()
|
|
@@ -772,7 +762,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
|
|
|
category.ShowDialog();
|
|
|
List<string> ls = category.OutElementList;
|
|
|
TCCleannessAList = category.vs;
|
|
|
- list_MainPriority = category.OutElementList;
|
|
|
+ list_MainPriority = category.OutElementList.Copy();
|
|
|
string str = "";
|
|
|
for (int i = 0; i < ls.Count; i++)
|
|
|
{
|