新迈威项目修改

UAS_MES_XMW/CustomControl/HeadBar/HeadBar.cs

@@ -122,7 +122,7 @@ namespace UAS_MES_NEW.CustomControl
                 if (logout_confirm == "Yes")
                 {
                     //注销的时候切换回默认数据库
-                    SystemInf.ConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11660)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+                    SystemInf.ConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES_XMW;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11660)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
                     DataHelper.DBConnectionString = SystemInf.ConnectionString;
                     //清除上个用户的权限信息
                     SystemInf.Caller.Clear();

UAS_MES_XMW/DataOperate/DataHelper.cs

@@ -10,11 +10,11 @@ namespace UAS_MES_NEW.DataOperate
     class DataHelper
     {
         //系统默认的的连接字符串 
-        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11660)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES_XMW;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11660)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
 
         //public static readonly string ERPAddesss = "http://10.1.81.208:8099/mes/";
 
-        public static readonly string ERPAddesss = "http://mes.ubtob.net:8099/mes/";
+        public static readonly string ERPAddesss = "http://mes.ubtob.net:8099/xmw/";
 
         //用户选择的数据库的连接字符串
         public static string DBConnectionString;

UAS_MES_XMW/Login.cs

@@ -47,7 +47,7 @@ namespace UAS_MES_NEW
         {
             BaseUtil.FormStepInOrOut(this, true);
             //设置默认数据库
-            SystemInf.DefaultDB = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11660)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+            SystemInf.DefaultDB = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES_XMW;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11660)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             SystemInf.ProcessesID = System.Diagnostics.Process.GetCurrentProcess().Id;
             CheckForIllegalCrossThreadCalls = false;
             LoadMasterInf = new Thread(LoadMaster);

UAS_MES_XMW/Main.cs

@@ -357,7 +357,7 @@ namespace UAS_MES_NEW
             if (logout_confirm == "Yes")
             {
                 //注销的时候切换回默认数据库
-                SystemInf.ConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11660)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+                SystemInf.ConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES_XMW;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11660)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
                 DataHelper.DBConnectionString = SystemInf.ConnectionString;
                 //清除上个用户的权限信息
                 SystemInf.Caller.Clear();

UAS_MES_XMW/UAS_MES_XMW.csproj

@@ -713,23 +713,11 @@
     <Compile Include="FunctionCode\Make\Make_StencilScrapReason.Designer.cs">
       <DependentUpon>Make_StencilScrapReason.cs</DependentUpon>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_TestCollectionOnlyBad.cs">
+    <Compile Include="FunctionCode\Make\Make_TestCollection_Param.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FunctionCode\Make\Make_TestCollectionOnlyBad.Designer.cs">
-      <DependentUpon>Make_TestCollectionOnlyBad.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FunctionCode\Make\Make_TestCollection_JIAQIAN.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FunctionCode\Make\Make_TestCollection_JIAQIAN.Designer.cs">
-      <DependentUpon>Make_TestCollection_JIAQIAN.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FunctionCode\Make\Make_TestCollection_DCW.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FunctionCode\Make\Make_TestCollection_DCW.Designer.cs">
-      <DependentUpon>Make_TestCollection_DCW.cs</DependentUpon>
+    <Compile Include="FunctionCode\Make\Make_TestCollection_Param.Designer.cs">
+      <DependentUpon>Make_TestCollection_Param.cs</DependentUpon>
     </Compile>
     <Compile Include="FunctionCode\OQC\OQC_SamplingDataCollection_OffLine.cs">
       <SubType>Form</SubType>
@@ -1685,14 +1673,8 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_StencilScrapReason.resx">
       <DependentUpon>Make_StencilScrapReason.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_TestCollectionOnlyBad.resx">
-      <DependentUpon>Make_TestCollectionOnlyBad.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_TestCollection_JIAQIAN.resx">
-      <DependentUpon>Make_TestCollection_JIAQIAN.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FunctionCode\Make\Make_TestCollection_DCW.resx">
-      <DependentUpon>Make_TestCollection_DCW.cs</DependentUpon>
+    <EmbeddedResource Include="FunctionCode\Make\Make_TestCollection_Param.resx">
+      <DependentUpon>Make_TestCollection_Param.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\OQC\OQC_SamplingDataCollection_OffLine.resx">
       <DependentUpon>OQC_SamplingDataCollection_OffLine.cs</DependentUpon>