需要跳转的数据在同一页时处理

UAS-出货标签管理(吉利通)/PublicMethod/DataHelper.cs

@@ -11,16 +11,16 @@ namespace UAS_LabelMachine
     public class DataHelper
     {
 
-        ////富为外网地址
-        //private readonly string ConnectionStrings = "Data Source=richwellgroup.com.cn/orcl;User ID=DATACENTER;PassWord=select!#%*(";
-        ////富为ERP地址
-        //public static readonly string ERPAddesss = "http://richwellgroup.com.cn:8099/ERP/";
-        ////富为FTP
-        //public static readonly string FTPAdress = "ftp://richwellgroup.com.cn|printuser|printuser";
-        ////Oracle端口
-        //public static readonly string OraclePort = "1521";
-        ////需要显示的账套
-        //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=T_DATACENTER;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=www.jeelyton.net)(PORT=1522)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        //吉利通ERP地址
+        public static readonly string ERPAddesss = "http://www.jeelyton.net:8099/ERP/";
+        //吉利通FTP
+        public static readonly string FTPAdress = "ftp://218.18.115.198:21|Print|Administrator1@#";
+        //Oracle端口
+        public static readonly string OraclePort = "1522";
+        //需要显示的账套
+        public static readonly string Masters = "T_DATACENTER,T_JEELYTON";
 
         ////怡海能达外网地址
         //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)));";
@@ -33,16 +33,16 @@ 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@#";
-        //Oracle端口
-        public static readonly string OraclePort = "1523";
-        //需要显示的账套
-        public static readonly string Masters = "N_HUASL_SZ";
+        ////华商龙外网地址
+        //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 = "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)));";

UAS-出货标签管理(吉利通)/UAS_出货标签管理.cs

@@ -366,6 +366,12 @@ namespace UAS_LabelMachine
                                         if (CurrentRowIndex - 10 > 0)
                                             LabelInf.FirstDisplayedScrollingRowIndex = CurrentRowIndex - 10;
                                     }
+                                    else
+                                    {
+                                        CurrentRowIndex = rownum - 1;
+                                        if (CurrentRowIndex - 10 > 0)
+                                            LabelInf.FirstDisplayedScrollingRowIndex = CurrentRowIndex - 10;
+                                    }
                                 }
                                 else
                                 {
@@ -506,7 +512,7 @@ namespace UAS_LabelMachine
                 {
                     Item += CheckItem[i].ToString() + " ";
                 }
-                MessageLog.AppendText(Item + "复核不通过", Color.Red);
+                MessageLog.AppendText(Item + "复核不通过\n", Color.Red);
                 return false;
             }
             LabelInf.Rows[CurrentRowIndex].Cells["pib_ifrecheck"].Value = true;