评级添加多样品限制

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -707,7 +707,13 @@ namespace OTSIncAReportApp
                             m_ReportApp.m_TablesWindow.Activate();
                             break;
                         case CALCULATE_TABLE_TYPE.GB_Method1:
-                            //国标一
+                            var sou = m_ReportApp.m_conditionChoose.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
+                            if (sou.Contains("+"))
+                            {
+                                MessageBox.Show("This function does not support multiple samples!");
+                                return;
+                            }
+                                //国标一
                             Cursor.Current = Cursors.WaitCursor;
 
                             int index = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
@@ -741,6 +747,12 @@ namespace OTSIncAReportApp
 
                             break;
                         case CALCULATE_TABLE_TYPE.GB_Method2:
+                            var sou1 = m_ReportApp.m_conditionChoose.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
+                            if (sou1.Contains("+"))
+                            {
+                                MessageBox.Show("This function does not support multiple samples!");
+                                return;
+                            }
                             //国标二
                             Cursor.Current = Cursors.WaitCursor;
                             int index2 = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
@@ -770,6 +782,12 @@ namespace OTSIncAReportApp
                             m_ReportApp.m_TablesWindow.Activate();
                             break;
                         case CALCULATE_TABLE_TYPE.ASTM:
+                            var Val = m_ReportApp.m_conditionChoose.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
+                            if (Val.Contains("+"))
+                            {
+                                MessageBox.Show("This function does not support multiple samples!");
+                                return;
+                            }
                             //美标
                             Cursor.Current = Cursors.WaitCursor;
 
@@ -800,6 +818,12 @@ namespace OTSIncAReportApp
                             m_ReportApp.m_TablesWindow.Activate();
                             break;
                         case CALCULATE_TABLE_TYPE.DIN:
+                            var ite = m_ReportApp.m_conditionChoose.m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE].itemDisplayVal.ToString();
+                            if (ite.Contains("+"))
+                            {
+                                MessageBox.Show("This function does not support multiple samples!");
+                                return;
+                            }
                             //德标
                             Cursor.Current = Cursors.WaitCursor;
                             int index4 = m_ReportApp.m_conditionChoose.m_conditionData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);