Przeglądaj źródła

调整无法切换打印文件的BUG

章政 7 lat temu
rodzic
commit
7542db623b

+ 5 - 3
UAS-出货标签管理(泽天)/PublicMethod/DataHelper.cs

@@ -23,7 +23,7 @@ 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=sz.hi-mantech.com)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        //private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=YISEA;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.253.6)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
         ////怡海能达ERP地址
         //public static readonly string ERPAddesss = "http://sz.hi-mantech.com:8099/ERP/";
         ////怡海能达FTP
@@ -48,8 +48,10 @@ namespace UAS_LabelMachine
         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://183.47.41.3:21|uas|Zt2018";
+        //泽天FTP外网
+        //public static readonly string FTPAdress = "ftp://183.47.41.3:21|uas|Zt2018";
+        //泽天FTP内网
+        public static readonly string FTPAdress = "ftp://10.2.10.241|uas|Lz201478c";
         //Oracle端口
         public static readonly string OraclePort = "1521";
         //需要显示的账套

+ 5 - 6
UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -545,7 +545,7 @@ namespace UAS_LabelMachine
             {
                 Input.Clear();
                 sql.Clear();
-                sql.Append("select pi_id,pi_cardcode,to_char(pi_date,'yyyymmdd')pi_date from prodinout where pi_inoutno='" + pi_inoutno.Text + "'");
+                sql.Append("select pi_id,pi_cardcode,to_char(pi_date,'yyyymmdd')pi_date from prodinout where pi_inoutno='" + pi_inoutno.Text + "' and pi_invostatuscode='AUDITED'");
                 dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                 if (dt.Rows.Count > 0)
                 {
@@ -578,8 +578,7 @@ namespace UAS_LabelMachine
                     stw.ShowDialog();
                     LogManager.DoLog("输入单号【" + pi_inoutno.Text + "】");
                 }
-                else
-                    MessageBox.Show("当前出入库单号不存在!", "提示");
+                else MessageBox.Show("当前出入库单号不存在或者未审核!", "提示");
             }
         }
 
@@ -1130,7 +1129,7 @@ namespace UAS_LabelMachine
             {
                 if (ComBoxClickChangeLabelDoc)
                 {
-                    SingleReport.Load(SingleLabelCombox.Text);
+                    SingleReport.Load(ftpOperater.DownLoadTo + SingleLabelCombox.Text);
                 }
             }
             catch (Exception) { }
@@ -1147,7 +1146,7 @@ namespace UAS_LabelMachine
             {
                 if (ComBoxClickChangeLabelDoc)
                 {
-                    MidReport.Load(MidLabelCombox.Text);
+                    MidReport.Load(ftpOperater.DownLoadTo + MidLabelCombox.Text);
                 }
             }
             catch (Exception) { }
@@ -1164,7 +1163,7 @@ namespace UAS_LabelMachine
             {
                 if (ComBoxClickChangeLabelDoc)
                 {
-                    OutReport.Load(OutBoxCombox.Text);
+                    OutReport.Load(ftpOperater.DownLoadTo + OutBoxCombox.Text);
                 }
             }
             catch (Exception) { }