修改深爱标签导出

UAS-出货标签管理(贸易版)/ChangeMaster.Designer.cs

@@ -78,7 +78,7 @@
             this.Name = "ChangeMaster";
             this.Text = "切换账套";
             this.Load += new System.EventHandler(this.ChangeMaster_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/CustomControl/BlurSearch.Designer.cs

@@ -73,7 +73,7 @@
             this.Size = new System.Drawing.Size(154, 120);
             this.Load += new System.EventHandler(this.BlurSearch_Load);
             this.Leave += new System.EventHandler(this.BlurSearch_Leave);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/CustomControl/DataGridViewWithSerialNum.Designer.cs

@@ -40,7 +40,7 @@ namespace UAS_LabelMachine.CustomControl
             this.RowTemplate.Height = 23;
             this.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.DataGridViewWithSerialNum_CellPainting);
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
         }
         #endregion
     }

UAS-出货标签管理(贸易版)/CustomControl/EnterTextBox.Designer.cs

@@ -35,7 +35,7 @@
             this.Size = new System.Drawing.Size(196, 21);
             this.Enter += new System.EventHandler(this.EnterTextBox_Enter);
             this.Leave += new System.EventHandler(this.EnterTextBox_Leave);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(贸易版)/CustomControl/HeadBar.Designer.cs

@@ -61,7 +61,7 @@
             this.Name = "HeadBar";
             ((System.ComponentModel.ISupportInitialize)(this.MinWindow)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.CloseWindow)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(贸易版)/CustomControl/NumOnlyTextBox.Designer.cs

@@ -35,7 +35,7 @@
             this.Enter += new System.EventHandler(this.NumOnlyTextBox_Enter);
             this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.NumOnlyTextBox_KeyPress);
             this.Leave += new System.EventHandler(this.NumOnlyTextBox_Leave);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(贸易版)/CustomControl/Pagination.Designer.cs

@@ -233,7 +233,7 @@ namespace UAS_LabelMachine.CustomControl
             this.Cursor = System.Windows.Forms.Cursors.Hand;
             this.Name = "Pagination";
             this.Size = new System.Drawing.Size(543, 32);
-            this.panel1.ResumeLayout(false);
+            this.panel1.ResumeLayout(true);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.UpLoadData)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.DownLoadTemplet)).EndInit();
@@ -243,7 +243,7 @@ namespace UAS_LabelMachine.CustomControl
             ((System.ComponentModel.ISupportInitialize)(this.LastPage)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.NextPage)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.FirstPage)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(贸易版)/CustomControl/PrinterCombox.Designer.cs

@@ -50,7 +50,7 @@
             this.Name = "PrinterCombox";
             this.Size = new System.Drawing.Size(189, 19);
             this.Load += new System.EventHandler(this.PrinterCombox_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(贸易版)/CustomControl/SearchTextBox.Designer.cs

@@ -64,7 +64,7 @@
             this.Name = "SearchTextBox";
             this.Size = new System.Drawing.Size(247, 21);
             ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/CustomerRule.Designer.cs

@@ -139,7 +139,7 @@
             this.Text = "客户规则";
             this.Load += new System.EventHandler(this.CustomerRule_Load);
             this.SizeChanged += new System.EventHandler(this.CustomerRule_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/DateCodeSetAndPrint.Designer.cs

@@ -174,7 +174,7 @@
             this.Name = "DateCodeSetAndPrint";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "更新批号";
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/DbFind.Designer.cs

@@ -72,7 +72,7 @@
             this.Load += new System.EventHandler(this.DbFind_Load);
             this.SizeChanged += new System.EventHandler(this.DbFind_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.DbFindGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(贸易版)/ExportColumns.Designer.cs

@@ -157,7 +157,7 @@
             this.Load += new System.EventHandler(this.ExportColumns_Load);
             ((System.ComponentModel.ISupportInitialize)(this.FirstPage)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.DataPage)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/ExportExcel.Designer.cs

@@ -609,11 +609,11 @@
             this.Name = "ExportExcel";
             this.Text = "导出数据";
             this.Load += new System.EventHandler(this.ExportExcel_Load);
-            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.ResumeLayout(true);
             this.groupBox1.PerformLayout();
-            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.ResumeLayout(true);
             this.groupBox2.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/ExportExcel.cs

@@ -192,7 +192,7 @@ namespace UAS_LabelMachine
                 {
                     FilePath = eh.JINYUAN(dt1, dt, ExportFileDialog.SelectedPath, inoutno, SplitType, int.Parse(RowNum.Text), conditionbox);
                 }
-                else if (pi_cardcode == dh.GetConfig("LIPUXIN", "ExportProdExcel").ToString())
+                else if (pi_cardcode == dh.GetConfig("LIPUXIN", "ExportProdExcel").ToString()|| pi_cardcode== "101269")
                 {
                     FilePath = eh.LIPIUXIN(dt1, dt, ExportFileDialog.SelectedPath, inoutno, SplitType, int.Parse(RowNum.Text), conditionbox);
                 }

UAS-出货标签管理(贸易版)/Login.Designer.cs

@@ -200,7 +200,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.LoginIcon)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComData)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/PowerSetting.Designer.cs

@@ -253,7 +253,7 @@
             this.Text = "权限设置";
             this.Load += new System.EventHandler(this.PowerSetting_Load);
             ((System.ComponentModel.ISupportInitialize)(this.PowerSetDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/PreViewWindow.Designer.cs

@@ -55,7 +55,7 @@
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.PreViewWindow_FormClosed);
             this.Load += new System.EventHandler(this.PreViewWindow_Load);
             ((System.ComponentModel.ISupportInitialize)(this.LabelPreView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(贸易版)/PublicMethod/DataHelper.cs

@@ -12,18 +12,18 @@ namespace UAS_LabelMachine
     public class DataHelper
     {
 
-        ////深爱地址
-        //private readonly string ConnectionStrings = "Data Source=172.16.0.22/orcl;User ID=SZSI_P;PassWord=select!#%*(";
+        //深爱地址
+        private readonly string ConnectionStrings = "Data Source=172.16.0.22/orcl;User ID=SZSI_P;PassWord=select!#%*(";
 
-        //private readonly string IPConnectionStrings = "Data Source=172.16.0.22/orcl;User ID=SZSI_P;PassWord=select!#%*(";
-        ////深爱ERP地址
-        //public static readonly string ERPAddesss = "http://172.16.0.20:8099/ERP/";
-        ////深爱FTP
-        //public static readonly string FTPAddress = "ftp://172.16.0.22|vsftpd|vsftpd";
+        private readonly string IPConnectionStrings = "Data Source=172.16.0.22/orcl;User ID=SZSI_P;PassWord=select!#%*(";
+        //深爱ERP地址
+        public static readonly string ERPAddesss = "http://172.16.0.20:8099/ERP/";
+        //深爱FTP
+        public static readonly string FTPAddress = "ftp://172.16.0.22|vsftpd|vsftpd";
 
-        //public static readonly string InnerFTPAddress = "ftp://172.16.0.22|vsftpd|vsftpd";
-        ////Oracle端口
-        //public static readonly string OraclePort = "1521";
+        public static readonly string InnerFTPAddress = "ftp://172.16.0.22|vsftpd|vsftpd";
+        //Oracle端口
+        public static readonly string OraclePort = "1521";
 
         //private readonly string ConnectionStrings = "Data Source=183.238.26.45/orcl;User ID=N_HC;PassWord=select!#%*(";
 
@@ -50,17 +50,17 @@ namespace UAS_LabelMachine
         ////Oracle端口
         //public static readonly string OraclePort = "1521";
 
-        private readonly string ConnectionStrings = "Data Source=in.ysksemi.com/orcl;User ID=YSK_DATACENTER;PassWord=select!#%*(";
+        //private readonly string ConnectionStrings = "Data Source=in.ysksemi.com/orcl;User ID=YSK_DATACENTER;PassWord=select!#%*(";
 
-        private readonly string IPConnectionStrings = "Data Source=in.ysksemi.com/orcl;User ID=YSK_DATACENTER;PassWord=select!#%*(";
-        //永顺康地址
-        public static readonly string ERPAddesss = "http://in.ysksemi.com:8099/ERP/";
-        //永顺康FTP
-        public static readonly string FTPAddress = "ftp://in.ysksemi.com:30000|vsftpd|vsftpd3cd79014ec";
+        //private readonly string IPConnectionStrings = "Data Source=in.ysksemi.com/orcl;User ID=YSK_DATACENTER;PassWord=select!#%*(";
+        ////永顺康地址
+        //public static readonly string ERPAddesss = "http://in.ysksemi.com:8099/ERP/";
+        ////永顺康FTP
+        //public static readonly string FTPAddress = "ftp://in.ysksemi.com:30000|vsftpd|vsftpd3cd79014ec";
 
-        public static readonly string InnerFTPAddress = "ftp://192.168.0.251:30000|vsftpd|vsftpd3cd79014ec";
-        //Oracle端口
-        public static readonly string OraclePort = "1521";
+        //public static readonly string InnerFTPAddress = "ftp://192.168.0.251:30000|vsftpd|vsftpd3cd79014ec";
+        ////Oracle端口
+        //public static readonly string OraclePort = "1521";
 
         ////凯而高地址
         //private readonly string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=KRG_TEST;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=112.25.154.186)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";

UAS-出货标签管理(贸易版)/ReSetMaxNum.Designer.cs

@@ -78,7 +78,7 @@
             this.Name = "ReSetMaxNum";
             this.Text = "流水设置";
             this.Load += new System.EventHandler(this.ReSetMaxNum_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/SetLoadingWindow.Designer.cs

@@ -74,7 +74,7 @@
             this.Text = "SetLoadingWindow";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SetLoadingWindow_FormClosing);
             this.Load += new System.EventHandler(this.SetLoadingWindow_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS-出货标签管理(贸易版)/SetLotNo.Designer.cs

@@ -180,7 +180,7 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "DateCodeSetAndPrint";
             this.Load += new System.EventHandler(this.DateCodeSetAndPrint_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/UAS_出货标签管理.cs

@@ -261,12 +261,22 @@ namespace UAS_LabelMachine
             {
                 try
                 {
-                    lbl = new ApplicationClass();
+                    engine = new Engine(true);
+                    PrintMethod = "BarTender";
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
-                    MessageBox.Show("未安装CodeSoft软件或者版本不正确");
+                    MessageLog.AppendText(ex.Message + ex.StackTrace);
+                    //MessageBox.Show(ex.Message + ex.StackTrace);
                 }
+                //try
+                //{
+                //    lbl = new ApplicationClass();
+                //}
+                //catch (Exception)
+                //{
+                //    MessageBox.Show("未安装CodeSoft软件或者版本不正确");
+                //}
             }
             else
             {
@@ -289,6 +299,8 @@ namespace UAS_LabelMachine
 
         private void Sg_code_DbChange(object sender, EventArgs e)
         {
+            Form f = Form.ActiveForm;
+          
             DataTable dt = sg_code.ReturnData;
             BaseUtil.SetFormValue(this.Controls, dt);
         }
@@ -1188,7 +1200,7 @@ namespace UAS_LabelMachine
 
                     if (dh.GetConfig("AutoBarcode", "ProdInOut!Sale").ToString() != "")
                     {
-                        string[] param = new string[] { PI_ID, "", "" };
+                        string[] param = new string[] { PI_ID, ""};
                         dh.CallProcedure("GetCustBarcode", ref param);
                     }
                     if (dh.GetConfig("PassOrNeg", "FTPModel").ToString() != "Y")
@@ -2124,20 +2136,7 @@ namespace UAS_LabelMachine
                         MidDoc.Close();
                     if (MidFormat != null)
                         MidFormat.Close(SaveOptions.DoNotSaveChanges);
-                    if (MidLabelCombox.Text != "" && MidLabelCombox.SelectedValue != null && !GetGridOnly.Checked)
-                    {
-                        System.DateTime time = Convert.ToDateTime(MidLabelCombox.SelectedValue.ToString().Split('#')[2]);
-                        if (PrintMethod == "CodeSoft")
-                        {
-                            MidDoc = lbl.Documents.Open(BaseUtil.GetLabelUrl(MidLabelCombox.SelectedValue.ToString().Split('#')[1], MidLabelCombox.Text, time));
-                            MidDoc.Printer.Name = MidLabelPrinter.Text;
-                        }
-                        else
-                        {
-                            MidFormat = engine.Documents.Open(BaseUtil.GetLabelUrl(MidLabelCombox.SelectedValue.ToString().Split('#')[1], MidLabelCombox.Text, time));
-                            MidFormat.PrintSetup.PrinterName = MidLabelPrinter.Text;
-                        }
-                    }
+                    MidFormat = engine.Documents.Open(ftpOperater.DownLoadTo + MidLabelCombox.Text);
                 }
             }
             catch (Exception) { }

UAS-出货标签管理(贸易版)/生成条码.Designer.cs

@@ -458,7 +458,7 @@
             this.Load += new System.EventHandler(this.生成条码_Load);
             this.SizeChanged += new System.EventHandler(this.生成条码_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ProdIoInfDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/采集策略.Designer.cs

@@ -1566,7 +1566,7 @@
             this.Text = "采集策略";
             this.Load += new System.EventHandler(this.采集策略_Load);
             this.SizeChanged += new System.EventHandler(this.采集策略_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/附件内容打印.Designer.cs

@@ -506,7 +506,7 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "附加内容打印";
             this.Load += new System.EventHandler(this.附件内容打印_Load);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }