超时BUG处理

UAS-出货标签管理/Login.cs

@@ -37,7 +37,7 @@ namespace UAS_LabelMachine
             DataTable MasterDB = dt.Clone();
             for (int i = 0; i < dt.Rows.Count; i++)
             {
-                if (DataHelper.Masters.Contains(dt.Rows[i]["ma_user"].ToString()))
+                //if (DataHelper.Masters.Contains(dt.Rows[i]["ma_user"].ToString()))
                 {
                     DataRow dr = MasterDB.NewRow();
                     dr["ma_user"] = dt.Rows[i]["ma_user"];

UAS-出货标签管理/PublicMethod/DataHelper.cs

@@ -23,17 +23,6 @@ namespace UAS_LabelMachine
         ////需要显示的账套
         //public static readonly string Masters = "JDTSY,FW_JDT,N_DATACENTER,FY_TEST,JD_TEST,XY_TEST,FW_TEST,DATACENTER,FW,XY,FY";
 
-        ////高登地址
-        //private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=183.238.39.179)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
-        ////高登ERP地址
-        //public static readonly string ERPAddesss = "http://183.238.39.179:8099/ERP/";
-        ////高登TP
-        ////public static readonly string FTPAdress = "ftp://192.168.0.158:21|GOLDENFTP|Admin1@#";
-        //public static readonly string FTPAdress = "ftp://183.238.39.179:21|GOLDENFTP|Admin1@#";
-        ////Oracle端口
-        //public static readonly string OraclePort = "1521";
-        ////需要显示的账套
-        //public static readonly string Masters = "GOLDEN";
 
         ////怡海能达外网地址
         private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=sz.hi-mantech.com)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
@@ -49,27 +38,6 @@ namespace UAS_LabelMachine
         //需要显示的账套
         public static readonly string Masters = "YHND_SZ,YHND_HK,DATACENTER,YITOA_ZX,T_YHND_HK";
 
-        ////华商龙外网地址
-        //private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=YITOA_DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.18.115.198)(PORT=1523)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
-        ////华商龙ERP地址
-        //public static readonly string ERPAddesss = "http://218.18.115.198:8888/ERP/";
-        ////华商龙FTP
-        //public static readonly string FTPAdress = "ftp://218.18.115.198:21|Print|Administrator1@#";
-        ////Oracle端口
-        //public static readonly string OraclePort = "1523";
-        ////需要显示的账套
-        //public static readonly string Masters = "XSQ,N_YITOA_YWC,ZXN,N_YITOA_LHCT,N_YITOA_CT,N_CHL,N_YITOA_HK,N_HUASL_SHTL,N_WILICHK,N_WILIC,N_E_SHINE_SH,N_SHBJ,N_BJKG,N_HUASL,N_HUASL_QD,N_HUASL_XM,N_HUASL_SZ";
-
-        ////UAS测试地址
-        //private readonly string ConnectionStrings = "Data Source=192.168.253.6/orcl;User ID=UAS_TEST;PassWord=select!#%*(";
-        ////UAS测试地址
-        //public static readonly string ERPAddesss = "http://192.168.253.6/uas_test/";
-        ////UAS测试FTP
-        //public static readonly string FTPAdress = "ftp://192.168.253.9/PrintFile|mesconfig|Administrator1@#";
-        ////Oracle端口
-        //public static readonly string OraclePort = "1521";
-        ////需要显示的账套
-        //public static readonly string Masters = "UAS_TEST";
         public static string DBConnectionString;
         static OracleConnection connection = null;
         static OracleCommand command = null;
@@ -859,10 +827,21 @@ namespace UAS_LabelMachine
             switch (Type.ToUpper())
             {
                 case "SELECT":
-                    result = new DataTable();
                     OracleDataAdapter ad = new OracleDataAdapter(command);
-                    ad.Fill((DataTable)result);
-                    ad.Dispose();
+                    result = new DataTable();
+                    try
+                    {
+                        ad.Fill((DataTable)result);
+                    }
+                    catch (Exception)
+                    {
+                        connection = new OracleConnection(DBConnectionString);
+                        connection.Open();
+                        command = new OracleCommand(SQL, connection);
+                        ad = new OracleDataAdapter();
+                        ad.SelectCommand = command;
+                        ad.Fill((DataTable)result);
+                    }
                     //成功执行后将重复连接数置为0
                     break;
                 case "DELETE":