Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2

OTSIncAReportApp/1-UI/OTSRibbon/OTSRibbonFun.cs

@@ -128,18 +128,18 @@ namespace OTSIncAReportApp.OTSRibbon
 
             
             var m_RptConfigFile =RptConfigFile.GetRptConfig();         //报表程序的配置文件
-            if (m_RptConfigFile.Systype == OTS_SysType_ID.TCCleannessA)
-            {
-                m_ReportApp.ribbonOrbMenuItem_Extremum.Enabled = false;
-                m_ReportApp.ribbonOrbMenuItem_InclusionsTraceability.Enabled = false;
-                m_ReportApp.ribbonOrbMenuItem_purity.Enabled = false;
-            }
-            else
+            if (m_RptConfigFile.Systype == OTS_SysType_ID.IncA)
             {
                 m_ReportApp.ribbonOrbMenuItem_InclusionsTraceability.Enabled = true;
                 m_ReportApp.ribbonOrbMenuItem_Extremum.Enabled = true;
                 m_ReportApp.ribbonOrbMenuItem_purity.Enabled = true;
             }
+            else
+            {
+                m_ReportApp.ribbonOrbMenuItem_Extremum.Enabled = false;
+                m_ReportApp.ribbonOrbMenuItem_InclusionsTraceability.Enabled = false;
+                m_ReportApp.ribbonOrbMenuItem_purity.Enabled = false;
+            }
         }
 
         #endregion

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -1690,7 +1690,6 @@
     <EmbeddedResource Include="Help.resx">
       <DependentUpon>Help.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>