Merge branch 'master' of ssh://10.10.100.21/source/mes-client

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

@@ -33,17 +33,27 @@ namespace UAS_LabelMachine
         ////需要显示的账套
         //public static readonly string Masters = "YHND_SZ,YHND_HK,DATACENTER";
 
-        //华商龙外网地址
-        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@#";
+        ////华商龙外网地址
+        //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";
+
+        //泽天外网地址
+        private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=ZT_TEST;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=183.47.41.2)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        //泽天ERP地址
+        public static readonly string ERPAddesss = "http://183.47.41.2:8099/ERP/";
+        //泽天FTP
+        public static readonly string FTPAdress = "ftp://182.47.41.3|uas|Zt2018";
         //Oracle端口
-        public static readonly string OraclePort = "1523";
+        public static readonly string OraclePort = "1521";
         //需要显示的账套
-        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";
-
+        public static readonly string Masters = "ZT_TEST";
         //用户选择的数据库的连接字符串
         public static string DBConnectionString;
         static OracleConnection connection = null;