Browse Source

修改清洁度报告模板设置界面,默认更改为和当前测量结果标准库一致

zhangjiaxin 3 months ago
parent
commit
c9e0b25631

+ 21 - 9
OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.cs

@@ -3,6 +3,7 @@ using DevExpress.Utils.Extensions;
 using NPOI.Util;
 using OTSCommon.DBOperate;
 using OTSIncAReportApp._1_UI.OTSReportExport;
+using OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration;
 using OTSIncAReportApp._1_UI.OTSTemplateDesigner;
 using OTSIncAReportApp.DataOperation.DataAccess;
 using OTSIncAReportApp.OTSSampleReportInfo;
@@ -57,7 +58,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             BindControl();
             //读取默认值
             LoadControls();
-            label_StandardLibraryName.Text= table["standardlibrary"].ToString() + m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName;
+
+			TableHeaderData HeaderData = new TableHeaderData();
+			DataTable data = HeaderData.GetData(m_OTSReport_Export);
+			string strResultLibraryName = data.Rows[3][1].ToString()+".db";
+			label_StandardLibraryName.Text= table["standardlibrary"].ToString() + m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName;
             for (int i=0;i< m_OTSReport_Export.LibraryName.Count;i++)
             {
                 comboBox1.Items.Add(m_OTSReport_Export.LibraryName[i][0]);
@@ -66,18 +71,26 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             for (int i=0;i< m_OTSReport_Export.LibraryName.Count;i++)
             {
-                if (m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName== m_OTSReport_Export.LibraryName[i][0])
+                if (strResultLibraryName == m_OTSReport_Export.LibraryName[i][0])
                 {
                     CurrentName = i;
                     break;
                 }
             }
-            if (m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName !="")
+            //if (m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName !="")
+            //{
+            //    comboBox1.SelectedIndex = CurrentName;
+            //}
+            if (m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName == strResultLibraryName)
             {
-                comboBox1.SelectedIndex = CurrentName;
-            }
+				TCCleannessAList = m_OTSReport_Export.m_mbszclass.list_str_MainPriority_Serial.Copy();
+				list_MainPriority = m_OTSReport_Export.m_mbszclass.list_str_MainPriority.Copy();
+				textBox_zypxss.Text = m_OTSReport_Export.m_mbszclass.str_MainPriority;
+				comboBox1.SelectedIndex = CurrentName;
+			}
+			
 
-            if (m_OTSReport_Export.m_ReportApp.m_RptConfigFile.Systype == OTS_SysType_ID.TCCleannessA)
+			if (m_OTSReport_Export.m_ReportApp.m_RptConfigFile.Systype == OTS_SysType_ID.TCCleannessA)
             {
                 cb_TccleanlinessA.Enabled = true;
             }
@@ -494,14 +507,13 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             comboBox_p3.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_sort_p3;
            
             //delete_Class.Text = m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_kllb_DeleteClass;
-            textBox_zypxss.Text = m_OTSReport_Export.m_mbszclass.str_MainPriority;
+            
 
             numericMin.Text = m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_int_kllb_number.ToString();
 
 
             textBox1.Text = m_OTSReport_Export.m_mbszclass.M_DZ.Notes;
-            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()