打印程序调整

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

@@ -21,5 +21,8 @@ namespace UAS_LabelMachine.Entity
         public static string IP = "";
 
         public static string MasterName;
+
+        public static bool FTPModel=true;
+
     }
 }

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

@@ -67,6 +67,7 @@ namespace UAS_LabelMachine
                     Ms_Pwd = Masterdt.Rows[i]["ms_pwd"].ToString();
             }
             //切换至用户选择的数据源
+            //MessageBox.Show(MasterCombox.SelectedValue.ToString());
             string ConnectionString = "Connection Timeout=0;Pooling=false;Password=" + Ms_Pwd + ";User ID=" + MasterCombox.SelectedValue.ToString() + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" + IP.Text + ")(PORT=" + DataHelper.OraclePort + ")))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             DataHelper.DBConnectionString = ConnectionString;
             //设置当前账套

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

@@ -12,6 +12,7 @@ using Seagull.BarTender.Print;
 using Microsoft.CSharp;
 using System.CodeDom.Compiler;
 using System.Reflection;
+using UAS_LabelMachine.Entity;
 
 namespace UAS_LabelMachine
 {
@@ -299,7 +300,7 @@ namespace UAS_LabelMachine
             //如果是传入的数据是从FTP取的文件
             if (URL.Contains("ftp:"))
             {
-                ftpOperater ftp = new ftpOperater(Properties.Settings.Default.FTPModel);
+                ftpOperater ftp = new ftpOperater(SystemInf.FTPModel);
                 return ftp.Download(LabelName, time);
             }
             else

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

@@ -5,6 +5,7 @@ using System.Text;
 using System.Collections;
 using UAS_LabelMachine.PublicMethod;
 using System.Collections.Generic;
+using System.Windows.Forms;
 
 namespace UAS_LabelMachine
 {
@@ -36,6 +37,18 @@ 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 IPConnectionStrings = "Data Source=in.ysksemi.com/orcl;User ID=YSK_DATACENTER;PassWord=select!#%*(";
+        ////海创ERP地址
+        //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";
+
         ////凯而高地址
         //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)));";
         ////凯而高ERP地址
@@ -89,10 +102,12 @@ namespace UAS_LabelMachine
                 {
                     DBConnectionString = ConnectionStrings;
                     connection = new OracleConnection(ConnectionStrings);
+                    //MessageBox.Show(ConnectionStrings);
                 }
                 else
                 {
                     connection = new OracleConnection(DBConnectionString);
+                    //MessageBox.Show(DBConnectionString);
                 }
                 connection.Open();
             }

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

@@ -215,7 +215,7 @@ namespace UAS_LabelMachine.PublicMethod
             Dictionary<string, Dictionary<string, decimal>> outsumqty = new Dictionary<string, Dictionary<string, decimal>>();
             for (int i = 0; i < dt.Rows.Count; i++)
             {
-                string pr_spec = dt.Rows[i]["规格型号"].ToString().Trim().ToUpper();
+                string pr_spec = dt.Rows[i]["规格型号"].ToString().Trim();
                 if (pr_spec.Trim() == "")
                 {
                     break;
@@ -257,7 +257,7 @@ namespace UAS_LabelMachine.PublicMethod
             //上一个的最小外箱号，如果箱号没有发生变化则外箱条码也不变化
             for (int i = 0; i < dt.Rows.Count; i++)
             {
-                string pr_spec = dt.Rows[i]["规格型号"].ToString().Trim().ToUpper();
+                string pr_spec = dt.Rows[i]["规格型号"].ToString().Trim();
                 string 品牌 = dt.Rows[i]["品牌"].ToString().Trim();
                 string 产地 = dt.Rows[i]["产地"].ToString().Trim();
                 string 尺寸 = dt.Rows[i]["尺寸"].ToString().Trim();

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

@@ -432,9 +432,9 @@ namespace UAS_LabelMachine.PublicMethod
                         OutFormat.PrintSetup.IdenticalCopiesOfLabel = 1;
                         OutFormat.Print();
                     }
-                    catch (Exception)
+                    catch (Exception e)
                     {
-
+                        Console.WriteLine(e.Message + e.StackTrace);
                     }
                 }
             }

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

@@ -3,6 +3,7 @@ using System.IO;
 using System.Net;
 using System.Text;
 using System.Windows.Forms;
+using UAS_LabelMachine.Entity;
 
 namespace UAS_LabelMachine
 {
@@ -53,7 +54,7 @@ namespace UAS_LabelMachine
             FtpWebRequest reqFTP;
             reqFTP = (FtpWebRequest)FtpWebRequest.Create(new Uri(ftpServerIP + "/" + filename));
             reqFTP.UseBinary = true;
-            reqFTP.UsePassive = Properties.Settings.Default.FTPModel;
+            reqFTP.UsePassive = SystemInf.FTPModel;
             reqFTP.Credentials = new NetworkCredential(ftpUser, ftpPwd);
             reqFTP.Method = WebRequestMethods.Ftp.UploadFile;
             FileInfo file = new FileInfo(filepath + "/" + filename);
@@ -92,7 +93,7 @@ namespace UAS_LabelMachine
                 reqFTP.UseBinary = true;
                 reqFTP.Credentials = new NetworkCredential(ftpUser, ftpPwd);
                 reqFTP.Method = WebRequestMethods.Ftp.ListDirectory;
-                reqFTP.UsePassive = Properties.Settings.Default.FTPModel;
+                reqFTP.UsePassive = SystemInf.FTPModel;
                 WebResponse response = reqFTP.GetResponse();
                 StreamReader reader = new StreamReader(response.GetResponseStream());
 
@@ -131,7 +132,7 @@ namespace UAS_LabelMachine
                 reqFTP = (FtpWebRequest)FtpWebRequest.Create(new Uri(ftpServerIP + "/" + filename));
                 reqFTP.Method = WebRequestMethods.Ftp.GetFileSize;
                 reqFTP.UseBinary = true;
-                reqFTP.UsePassive = Properties.Settings.Default.FTPModel;
+                reqFTP.UsePassive = SystemInf.FTPModel;
                 reqFTP.Credentials = new NetworkCredential(ftpUser, ftpPwd);
                 FtpWebResponse response = (FtpWebResponse)reqFTP.GetResponse();
                 Stream ftpStream = response.GetResponseStream();
@@ -160,7 +161,7 @@ namespace UAS_LabelMachine
                 reqFTP.Method = WebRequestMethods.Ftp.DownloadFile;
                 reqFTP.UseBinary = true;
                 reqFTP.Credentials = new NetworkCredential(ftpUser, ftpPwd);
-                reqFTP.UsePassive = Properties.Settings.Default.FTPModel;
+                reqFTP.UsePassive = SystemInf.FTPModel;
                 FtpWebResponse response = (FtpWebResponse)reqFTP.GetResponse();
                 Stream ftpStream = response.GetResponseStream();
                 long cl = response.ContentLength;

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

@@ -125,6 +125,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>tool\Seagull.BarTender.Print.dll</HintPath>
     </Reference>
+    <Reference Include="Seagull.Framework.resources, Version=10.1.4.1, Culture=zh-CHS, PublicKeyToken=109ff779a1b4cbc7, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Users\callm\Desktop\Seagull.Framework.resources.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.configuration" />

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

@@ -203,6 +203,7 @@
             this.OutboxCapacity = new System.Windows.Forms.NumericUpDown();
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
+            this.FTPModel = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             this.ShowMenu.SuspendLayout();
@@ -913,7 +914,7 @@
             // 
             this.Order_Prod.AutoSize = true;
             this.Order_Prod.Checked = true;
-            this.Order_Prod.Location = new System.Drawing.Point(49, 360);
+            this.Order_Prod.Location = new System.Drawing.Point(52, 363);
             this.Order_Prod.Name = "Order_Prod";
             this.Order_Prod.Size = new System.Drawing.Size(149, 28);
             this.Order_Prod.TabIndex = 92;
@@ -925,7 +926,7 @@
             // Order_Detno
             // 
             this.Order_Detno.AutoSize = true;
-            this.Order_Detno.Location = new System.Drawing.Point(49, 417);
+            this.Order_Detno.Location = new System.Drawing.Point(52, 420);
             this.Order_Detno.Name = "Order_Detno";
             this.Order_Detno.Size = new System.Drawing.Size(149, 28);
             this.Order_Detno.TabIndex = 91;
@@ -937,7 +938,7 @@
             // 
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label18.Location = new System.Drawing.Point(140, 278);
+            this.label18.Location = new System.Drawing.Point(143, 281);
             this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(24, 31);
@@ -972,7 +973,7 @@
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label16.Location = new System.Drawing.Point(138, 132);
+            this.label16.Location = new System.Drawing.Point(141, 135);
             this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(24, 31);
@@ -1007,7 +1008,7 @@
             // 
             this.label12.AutoSize = true;
             this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label12.Location = new System.Drawing.Point(22, 224);
+            this.label12.Location = new System.Drawing.Point(25, 227);
             this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(110, 31);
@@ -1018,7 +1019,7 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(22, 82);
+            this.label7.Location = new System.Drawing.Point(25, 85);
             this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(110, 31);
@@ -1072,7 +1073,7 @@
             // 
             this.Capacity.AutoSize = true;
             this.Capacity.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Capacity.Location = new System.Drawing.Point(120, 138);
+            this.Capacity.Location = new System.Drawing.Point(123, 141);
             this.Capacity.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Capacity.Name = "Capacity";
             this.Capacity.Size = new System.Drawing.Size(0, 31);
@@ -1082,7 +1083,7 @@
             // 
             this.Process_midboxcode.AutoSize = true;
             this.Process_midboxcode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process_midboxcode.Location = new System.Drawing.Point(120, 226);
+            this.Process_midboxcode.Location = new System.Drawing.Point(123, 229);
             this.Process_midboxcode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Process_midboxcode.Name = "Process_midboxcode";
             this.Process_midboxcode.Size = new System.Drawing.Size(28, 31);
@@ -1093,7 +1094,7 @@
             // 
             this.Process_outboxcode.AutoSize = true;
             this.Process_outboxcode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process_outboxcode.Location = new System.Drawing.Point(120, 178);
+            this.Process_outboxcode.Location = new System.Drawing.Point(123, 181);
             this.Process_outboxcode.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Process_outboxcode.Name = "Process_outboxcode";
             this.Process_outboxcode.Size = new System.Drawing.Size(28, 31);
@@ -1105,7 +1106,7 @@
             this.TotalCount.AutoSize = true;
             this.TotalCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.TotalCount.ForeColor = System.Drawing.Color.Blue;
-            this.TotalCount.Location = new System.Drawing.Point(188, 42);
+            this.TotalCount.Location = new System.Drawing.Point(191, 45);
             this.TotalCount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.TotalCount.Name = "TotalCount";
             this.TotalCount.Size = new System.Drawing.Size(28, 31);
@@ -1116,7 +1117,7 @@
             // 
             this.label17.AutoSize = true;
             this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label17.Location = new System.Drawing.Point(160, 42);
+            this.label17.Location = new System.Drawing.Point(163, 45);
             this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(24, 31);
@@ -1128,7 +1129,7 @@
             this.CollectedCount.AutoSize = true;
             this.CollectedCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.CollectedCount.ForeColor = System.Drawing.Color.Red;
-            this.CollectedCount.Location = new System.Drawing.Point(124, 42);
+            this.CollectedCount.Location = new System.Drawing.Point(127, 45);
             this.CollectedCount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.CollectedCount.Name = "CollectedCount";
             this.CollectedCount.Size = new System.Drawing.Size(28, 31);
@@ -1139,7 +1140,7 @@
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.Location = new System.Drawing.Point(20, 178);
+            this.label14.Location = new System.Drawing.Point(23, 181);
             this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(62, 31);
@@ -1150,7 +1151,7 @@
             // 
             this.label11.AutoSize = true;
             this.label11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label11.Location = new System.Drawing.Point(20, 224);
+            this.label11.Location = new System.Drawing.Point(23, 227);
             this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(62, 31);
@@ -1161,7 +1162,7 @@
             // 
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label13.Location = new System.Drawing.Point(20, 98);
+            this.label13.Location = new System.Drawing.Point(23, 101);
             this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(86, 31);
@@ -1172,7 +1173,7 @@
             // 
             this.Installed.AutoSize = true;
             this.Installed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Installed.Location = new System.Drawing.Point(120, 98);
+            this.Installed.Location = new System.Drawing.Point(123, 101);
             this.Installed.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Installed.Name = "Installed";
             this.Installed.Size = new System.Drawing.Size(0, 31);
@@ -1182,7 +1183,7 @@
             // 
             this.Process.AutoSize = true;
             this.Process.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process.Location = new System.Drawing.Point(20, 42);
+            this.Process.Location = new System.Drawing.Point(23, 45);
             this.Process.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Process.Name = "Process";
             this.Process.Size = new System.Drawing.Size(86, 31);
@@ -1564,7 +1565,7 @@
             // 
             this.LabelSpace.AutoSize = true;
             this.LabelSpace.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LabelSpace.Location = new System.Drawing.Point(20, 280);
+            this.LabelSpace.Location = new System.Drawing.Point(23, 283);
             this.LabelSpace.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.LabelSpace.Name = "LabelSpace";
             this.LabelSpace.Size = new System.Drawing.Size(142, 35);
@@ -1577,7 +1578,7 @@
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.label8.Location = new System.Drawing.Point(12, 42);
+            this.label8.Location = new System.Drawing.Point(15, 45);
             this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(102, 35);
@@ -1587,7 +1588,7 @@
             // SingleDocRefresh
             // 
             this.SingleDocRefresh.AutoSize = true;
-            this.SingleDocRefresh.Location = new System.Drawing.Point(120, 42);
+            this.SingleDocRefresh.Location = new System.Drawing.Point(123, 45);
             this.SingleDocRefresh.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.SingleDocRefresh.Name = "SingleDocRefresh";
             this.SingleDocRefresh.Size = new System.Drawing.Size(82, 41);
@@ -1610,7 +1611,7 @@
             // 
             this.SingleLabelPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.SingleLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelPrint.Location = new System.Drawing.Point(160, 417);
+            this.SingleLabelPrint.Location = new System.Drawing.Point(161, 420);
             this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.SingleLabelPrint.Name = "SingleLabelPrint";
             this.SingleLabelPrint.Size = new System.Drawing.Size(136, 52);
@@ -1623,7 +1624,7 @@
             // 
             this.SingleLabelAutoPrint.AutoSize = true;
             this.SingleLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(22, 224);
+            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(25, 227);
             this.SingleLabelAutoPrint.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.SingleLabelAutoPrint.Name = "SingleLabelAutoPrint";
             this.SingleLabelAutoPrint.Size = new System.Drawing.Size(142, 35);
@@ -1671,7 +1672,7 @@
             // MidLabelPreView
             // 
             this.MidLabelPreView.AutoSize = true;
-            this.MidLabelPreView.Location = new System.Drawing.Point(198, 42);
+            this.MidLabelPreView.Location = new System.Drawing.Point(201, 45);
             this.MidLabelPreView.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.MidLabelPreView.Name = "MidLabelPreView";
             this.MidLabelPreView.Size = new System.Drawing.Size(82, 41);
@@ -1696,7 +1697,7 @@
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.label9.Location = new System.Drawing.Point(12, 42);
+            this.label9.Location = new System.Drawing.Point(15, 45);
             this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(102, 35);
@@ -1706,7 +1707,7 @@
             // MidDocRefresh
             // 
             this.MidDocRefresh.AutoSize = true;
-            this.MidDocRefresh.Location = new System.Drawing.Point(116, 42);
+            this.MidDocRefresh.Location = new System.Drawing.Point(119, 45);
             this.MidDocRefresh.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.MidDocRefresh.Name = "MidDocRefresh";
             this.MidDocRefresh.Size = new System.Drawing.Size(82, 41);
@@ -1732,7 +1733,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(18, 350);
+            this.label5.Location = new System.Drawing.Point(21, 353);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(62, 31);
@@ -1743,7 +1744,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(18, 288);
+            this.label4.Location = new System.Drawing.Point(21, 291);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(62, 31);
@@ -1764,7 +1765,7 @@
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(200, 290);
+            this.label15.Location = new System.Drawing.Point(203, 293);
             this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(38, 31);
@@ -1797,7 +1798,7 @@
             // 
             this.MidLabelAutoPrint.AutoSize = true;
             this.MidLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MidLabelAutoPrint.Location = new System.Drawing.Point(12, 214);
+            this.MidLabelAutoPrint.Location = new System.Drawing.Point(15, 217);
             this.MidLabelAutoPrint.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.MidLabelAutoPrint.Name = "MidLabelAutoPrint";
             this.MidLabelAutoPrint.Size = new System.Drawing.Size(142, 35);
@@ -1846,7 +1847,7 @@
             // 
             this.DiffCustOutBoxCode.AutoSize = true;
             this.DiffCustOutBoxCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.DiffCustOutBoxCode.Location = new System.Drawing.Point(196, 334);
+            this.DiffCustOutBoxCode.Location = new System.Drawing.Point(199, 337);
             this.DiffCustOutBoxCode.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.DiffCustOutBoxCode.Name = "DiffCustOutBoxCode";
             this.DiffCustOutBoxCode.Size = new System.Drawing.Size(142, 35);
@@ -1875,7 +1876,7 @@
             // 
             this.cu_print_ordercode.AutoSize = true;
             this.cu_print_ordercode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_ordercode.Location = new System.Drawing.Point(14, 136);
+            this.cu_print_ordercode.Location = new System.Drawing.Point(17, 139);
             this.cu_print_ordercode.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.cu_print_ordercode.Name = "cu_print_ordercode";
             this.cu_print_ordercode.Size = new System.Drawing.Size(142, 35);
@@ -1887,7 +1888,7 @@
             // 
             this.cu_print_outpo.AutoSize = true;
             this.cu_print_outpo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_outpo.Location = new System.Drawing.Point(14, 90);
+            this.cu_print_outpo.Location = new System.Drawing.Point(17, 93);
             this.cu_print_outpo.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.cu_print_outpo.Name = "cu_print_outpo";
             this.cu_print_outpo.Size = new System.Drawing.Size(142, 35);
@@ -1899,7 +1900,7 @@
             // 
             this.cu_print_outdc.AutoSize = true;
             this.cu_print_outdc.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_outdc.Location = new System.Drawing.Point(14, 232);
+            this.cu_print_outdc.Location = new System.Drawing.Point(17, 235);
             this.cu_print_outdc.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.cu_print_outdc.Name = "cu_print_outdc";
             this.cu_print_outdc.Size = new System.Drawing.Size(80, 35);
@@ -1911,7 +1912,7 @@
             // 
             this.cu_print_outlotno.AutoSize = true;
             this.cu_print_outlotno.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_outlotno.Location = new System.Drawing.Point(14, 182);
+            this.cu_print_outlotno.Location = new System.Drawing.Point(17, 185);
             this.cu_print_outlotno.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.cu_print_outlotno.Name = "cu_print_outlotno";
             this.cu_print_outlotno.Size = new System.Drawing.Size(117, 35);
@@ -1923,7 +1924,7 @@
             // 
             this.cu_print_outprod.AutoSize = true;
             this.cu_print_outprod.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_outprod.Location = new System.Drawing.Point(14, 40);
+            this.cu_print_outprod.Location = new System.Drawing.Point(17, 43);
             this.cu_print_outprod.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.cu_print_outprod.Name = "cu_print_outprod";
             this.cu_print_outprod.Size = new System.Drawing.Size(142, 35);
@@ -1935,7 +1936,7 @@
             // 
             this.label19.AutoSize = true;
             this.label19.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.label19.Location = new System.Drawing.Point(8, 44);
+            this.label19.Location = new System.Drawing.Point(11, 47);
             this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label19.Name = "label19";
             this.label19.Size = new System.Drawing.Size(102, 35);
@@ -1945,7 +1946,7 @@
             // OutDocRefresh
             // 
             this.OutDocRefresh.AutoSize = true;
-            this.OutDocRefresh.Location = new System.Drawing.Point(114, 44);
+            this.OutDocRefresh.Location = new System.Drawing.Point(117, 47);
             this.OutDocRefresh.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.OutDocRefresh.Name = "OutDocRefresh";
             this.OutDocRefresh.Size = new System.Drawing.Size(82, 41);
@@ -1957,7 +1958,7 @@
             // LogingOut
             // 
             this.LogingOut.AutoSize = true;
-            this.LogingOut.Location = new System.Drawing.Point(196, 44);
+            this.LogingOut.Location = new System.Drawing.Point(199, 47);
             this.LogingOut.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.LogingOut.Name = "LogingOut";
             this.LogingOut.Size = new System.Drawing.Size(146, 41);
@@ -1995,7 +1996,7 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(188, 286);
+            this.label10.Location = new System.Drawing.Point(191, 289);
             this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(62, 31);
@@ -2006,7 +2007,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(186, 226);
+            this.label6.Location = new System.Drawing.Point(189, 229);
             this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(62, 31);
@@ -2062,12 +2063,26 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
+            // FTPModel
+            // 
+            this.FTPModel.AutoSize = true;
+            this.FTPModel.Font = new System.Drawing.Font("微软雅黑", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.FTPModel.Location = new System.Drawing.Point(462, 308);
+            this.FTPModel.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.FTPModel.Name = "FTPModel";
+            this.FTPModel.Size = new System.Drawing.Size(158, 31);
+            this.FTPModel.TabIndex = 92;
+            this.FTPModel.Text = "FTP被动模式";
+            this.FTPModel.UseVisualStyleBackColor = true;
+            this.FTPModel.CheckedChanged += new System.EventHandler(this.FTPModel_CheckedChanged);
+            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(233)))), ((int)(((byte)(206)))));
             this.ClientSize = new System.Drawing.Size(2520, 1450);
+            this.Controls.Add(this.FTPModel);
             this.Controls.Add(this.CustBarCode);
             this.Controls.Add(this.pi_class);
             this.Controls.Add(this.MenuSetting);
@@ -2315,5 +2330,6 @@
         private System.Windows.Forms.LinkLabel MidLabelPreView;
         private System.Windows.Forms.RadioButton Order_Prod;
         private System.Windows.Forms.RadioButton Order_Detno;
+        private System.Windows.Forms.CheckBox FTPModel;
     }
 }

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

@@ -270,8 +270,17 @@ namespace UAS_LabelMachine
             }
             else
             {
-                engine = new Engine(true);
-                PrintMethod = "BarTender";
+                try
+                {
+                    engine = new Engine(true);
+                    PrintMethod = "BarTender";
+                }
+                catch (Exception ex)
+                {
+                    MessageLog.AppendText(ex.Message + ex.StackTrace);
+                    //MessageBox.Show(ex.Message + ex.StackTrace);
+                }
+              
             }
             pi_inoutno.BringToFront();
             LogicHandler.CustInit("0");
@@ -1176,11 +1185,22 @@ namespace UAS_LabelMachine
                     pi_date.Text = dt.Rows[0]["pi_date"].ToString();
                     pi_class.Text = dt.Rows[0]["pi_class"].ToString();
                     PI_ID = dt.Rows[0]["pi_id"].ToString();
+
                     if (dh.GetConfig("AutoBarcode", "ProdInOut!Sale").ToString() != "")
                     {
                         string[] param = new string[] { PI_ID, "" };
                         dh.CallProcedure("GetCustBarcode", ref param);
                     }
+                    if (dh.GetConfig("PassOrNeg", "FTPModel").ToString() != "Y")
+                    {
+                        FTPModel.Checked = false;
+                        SystemInf.FTPModel = false;
+                    }
+                    else
+                    {
+                        FTPModel.Checked = true;
+                        SystemInf.FTPModel = true;
+                    }
                     CurrentItemIndex = 0;
                     CurrentRowIndex = 0;
                     LoadGridData(sender, e);
@@ -1546,9 +1566,14 @@ namespace UAS_LabelMachine
             string pib_id = LabelInf.Rows[rowindex].Cells["pib_id1"].Value.ToString();
             string pib_outboxcode1 = LabelInf.Rows[rowindex].Cells["pib_outboxcode1"].Value.ToString();
             if (PrintMethod == "CodeSoft")
+            {
                 Print.CodeSoft.MidPrint(MidDoc, MidLabelParam, pi_inoutno.Text, pib_id, pib_outboxcode1);
+            }
             else
+            {
                 Print.BarTender.MidPrint(MidFormat, MidLabelParam, pi_inoutno.Text, pib_id, pib_outboxcode1);
+                MidFormat.PrintSetup.PrinterName = MidLabelPrinter.Text;
+            }
         }
 
         private void OutBoxCodePrint(int rowindex)
@@ -2640,6 +2665,7 @@ namespace UAS_LabelMachine
             {
                 LogManager.DoLog(ex.StackTrace);
                 MessageBox.Show(ex.Message);
+                Console.WriteLine(ex.StackTrace);
             }
         }
 
@@ -2826,5 +2852,26 @@ namespace UAS_LabelMachine
             pre.StartPosition = FormStartPosition.CenterScreen;
             pre.ShowDialog();
         }
+
+        private void FTPModel_CheckedChanged(object sender, EventArgs e)
+        {
+            if (FTPModel.Checked)
+            {
+                if (!dh.CheckExist("configs", "caller='FTPModel' and code='PassOrNeg'"))
+                {
+                    dh.ExecuteSql("insert into configs(id,caller,code,data)values(configs_seq.nextval,'FTPModel','PassOrNeg','Y')", "insert");
+                }
+                else
+                {
+                    dh.ExecuteSql("update configs set data='Y' where caller='FTPModel' and code ='PassOrNeg'", "insert");
+                }
+                SystemInf.FTPModel = true;
+            }
+            else
+            {
+                dh.ExecuteSql("update configs set data='N' where caller='FTPModel' and code ='PassOrNeg'", "insert");
+                SystemInf.FTPModel = false;
+            }
+        }
     }
 }

UAS-出货标签管理(贸易版)/客户标签维护.Designer.cs

@@ -108,9 +108,10 @@ namespace UAS_LabelMachine
             // 
             this.cl_code_label.AutoSize = true;
             this.cl_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cl_code_label.Location = new System.Drawing.Point(31, 15);
+            this.cl_code_label.Location = new System.Drawing.Point(62, 30);
+            this.cl_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.cl_code_label.Name = "cl_code_label";
-            this.cl_code_label.Size = new System.Drawing.Size(74, 21);
+            this.cl_code_label.Size = new System.Drawing.Size(146, 41);
             this.cl_code_label.TabIndex = 145;
             this.cl_code_label.Text = "客户编号";
             // 
@@ -118,9 +119,10 @@ namespace UAS_LabelMachine
             // 
             this.cu_name_label.AutoSize = true;
             this.cu_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_name_label.Location = new System.Drawing.Point(325, 16);
+            this.cu_name_label.Location = new System.Drawing.Point(650, 32);
+            this.cu_name_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.cu_name_label.Name = "cu_name_label";
-            this.cu_name_label.Size = new System.Drawing.Size(74, 21);
+            this.cu_name_label.Size = new System.Drawing.Size(146, 41);
             this.cu_name_label.TabIndex = 144;
             this.cu_name_label.Text = "客户名称";
             // 
@@ -132,9 +134,10 @@ namespace UAS_LabelMachine
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(919, 89);
+            this.label1.Location = new System.Drawing.Point(1838, 178);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(106, 21);
+            this.label1.Size = new System.Drawing.Size(210, 41);
             this.label1.TabIndex = 164;
             this.label1.Text = "模板参数预览";
             // 
@@ -142,17 +145,19 @@ namespace UAS_LabelMachine
             // 
             this.PrinterList_lable.AutoSize = true;
             this.PrinterList_lable.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrinterList_lable.Location = new System.Drawing.Point(920, 21);
+            this.PrinterList_lable.Location = new System.Drawing.Point(1840, 42);
+            this.PrinterList_lable.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.PrinterList_lable.Name = "PrinterList_lable";
-            this.PrinterList_lable.Size = new System.Drawing.Size(90, 21);
+            this.PrinterList_lable.Size = new System.Drawing.Size(178, 41);
             this.PrinterList_lable.TabIndex = 175;
             this.PrinterList_lable.Text = "打印机列表";
             // 
             // OpenFolder
             // 
-            this.OpenFolder.Location = new System.Drawing.Point(562, 490);
+            this.OpenFolder.Location = new System.Drawing.Point(1124, 980);
+            this.OpenFolder.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.OpenFolder.Name = "OpenFolder";
-            this.OpenFolder.Size = new System.Drawing.Size(75, 27);
+            this.OpenFolder.Size = new System.Drawing.Size(150, 54);
             this.OpenFolder.TabIndex = 156;
             this.OpenFolder.Text = "打开";
             this.OpenFolder.UseVisualStyleBackColor = true;
@@ -162,27 +167,30 @@ namespace UAS_LabelMachine
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(283, 453);
+            this.label3.Location = new System.Drawing.Point(566, 906);
+            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(74, 21);
+            this.label3.Size = new System.Drawing.Size(146, 41);
             this.label3.TabIndex = 171;
             this.label3.Text = "盘标类型";
             // 
             // FolderPath
             // 
             this.FolderPath.Enabled = false;
-            this.FolderPath.Location = new System.Drawing.Point(379, 493);
+            this.FolderPath.Location = new System.Drawing.Point(758, 986);
+            this.FolderPath.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.FolderPath.Name = "FolderPath";
-            this.FolderPath.Size = new System.Drawing.Size(161, 21);
+            this.FolderPath.Size = new System.Drawing.Size(318, 35);
             this.FolderPath.TabIndex = 157;
             // 
             // FolderPath_Label
             // 
             this.FolderPath_Label.AutoSize = true;
             this.FolderPath_Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.FolderPath_Label.Location = new System.Drawing.Point(283, 493);
+            this.FolderPath_Label.Location = new System.Drawing.Point(566, 986);
+            this.FolderPath_Label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.FolderPath_Label.Name = "FolderPath_Label";
-            this.FolderPath_Label.Size = new System.Drawing.Size(74, 21);
+            this.FolderPath_Label.Size = new System.Drawing.Size(146, 41);
             this.FolderPath_Label.TabIndex = 158;
             this.FolderPath_Label.Text = "模板路径";
             // 
@@ -195,18 +203,20 @@ namespace UAS_LabelMachine
             "单盘",
             "中盒",
             "外箱"});
-            this.la_type1.Location = new System.Drawing.Point(379, 454);
+            this.la_type1.Location = new System.Drawing.Point(758, 908);
+            this.la_type1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.la_type1.Name = "la_type1";
-            this.la_type1.Size = new System.Drawing.Size(161, 20);
+            this.la_type1.Size = new System.Drawing.Size(318, 32);
             this.la_type1.TabIndex = 169;
             // 
             // cl_custcode_label
             // 
             this.cl_custcode_label.AutoSize = true;
             this.cl_custcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cl_custcode_label.Location = new System.Drawing.Point(20, 450);
+            this.cl_custcode_label.Location = new System.Drawing.Point(40, 900);
+            this.cl_custcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.cl_custcode_label.Name = "cl_custcode_label";
-            this.cl_custcode_label.Size = new System.Drawing.Size(74, 21);
+            this.cl_custcode_label.Size = new System.Drawing.Size(146, 41);
             this.cl_custcode_label.TabIndex = 167;
             this.cl_custcode_label.Text = "客户编号";
             // 
@@ -214,9 +224,10 @@ namespace UAS_LabelMachine
             // 
             this.la_code_label.AutoSize = true;
             this.la_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.la_code_label.Location = new System.Drawing.Point(563, 453);
+            this.la_code_label.Location = new System.Drawing.Point(1126, 906);
+            this.la_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.la_code_label.Name = "la_code_label";
-            this.la_code_label.Size = new System.Drawing.Size(74, 21);
+            this.la_code_label.Size = new System.Drawing.Size(146, 41);
             this.la_code_label.TabIndex = 178;
             this.la_code_label.Text = "模板编号";
             // 
@@ -224,9 +235,10 @@ namespace UAS_LabelMachine
             // 
             this.NetURL_label.AutoSize = true;
             this.NetURL_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.NetURL_label.Location = new System.Drawing.Point(936, 49);
+            this.NetURL_label.Location = new System.Drawing.Point(1872, 98);
+            this.NetURL_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.NetURL_label.Name = "NetURL_label";
-            this.NetURL_label.Size = new System.Drawing.Size(74, 21);
+            this.NetURL_label.Size = new System.Drawing.Size(146, 41);
             this.NetURL_label.TabIndex = 181;
             this.NetURL_label.Text = "网络路径";
             // 
@@ -234,9 +246,10 @@ namespace UAS_LabelMachine
             // 
             this.cl_labeltype_label.AutoSize = true;
             this.cl_labeltype_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cl_labeltype_label.Location = new System.Drawing.Point(609, 15);
+            this.cl_labeltype_label.Location = new System.Drawing.Point(1218, 30);
+            this.cl_labeltype_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.cl_labeltype_label.Name = "cl_labeltype_label";
-            this.cl_labeltype_label.Size = new System.Drawing.Size(74, 21);
+            this.cl_labeltype_label.Size = new System.Drawing.Size(146, 41);
             this.cl_labeltype_label.TabIndex = 185;
             this.cl_labeltype_label.Text = "盘标类型";
             // 
@@ -245,9 +258,10 @@ namespace UAS_LabelMachine
             this.la_type.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.la_type.DropDownWidth = 161;
             this.la_type.FormattingEnabled = true;
-            this.la_type.Location = new System.Drawing.Point(705, 16);
+            this.la_type.Location = new System.Drawing.Point(1410, 32);
+            this.la_type.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.la_type.Name = "la_type";
-            this.la_type.Size = new System.Drawing.Size(161, 20);
+            this.la_type.Size = new System.Drawing.Size(318, 32);
             this.la_type.TabIndex = 184;
             this.la_type.Tag = "cl_labeltype";
             // 
@@ -255,18 +269,20 @@ namespace UAS_LabelMachine
             // 
             this.la_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.la_name.Location = new System.Drawing.Point(116, 493);
+            this.la_name.Location = new System.Drawing.Point(232, 986);
+            this.la_name.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.la_name.Name = "la_name";
-            this.la_name.Size = new System.Drawing.Size(1, 21);
+            this.la_name.Size = new System.Drawing.Size(0, 35);
             this.la_name.TabIndex = 186;
             // 
             // la_name_label
             // 
             this.la_name_label.AutoSize = true;
             this.la_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.la_name_label.Location = new System.Drawing.Point(20, 493);
+            this.la_name_label.Location = new System.Drawing.Point(40, 986);
+            this.la_name_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.la_name_label.Name = "la_name_label";
-            this.la_name_label.Size = new System.Drawing.Size(74, 21);
+            this.la_name_label.Size = new System.Drawing.Size(146, 41);
             this.la_name_label.TabIndex = 187;
             this.la_name_label.Text = "模板名称";
             // 
@@ -275,9 +291,10 @@ namespace UAS_LabelMachine
             this.FTPShare.AutoSize = true;
             this.FTPShare.Checked = true;
             this.FTPShare.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.FTPShare.Location = new System.Drawing.Point(659, 497);
+            this.FTPShare.Location = new System.Drawing.Point(1318, 994);
+            this.FTPShare.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.FTPShare.Name = "FTPShare";
-            this.FTPShare.Size = new System.Drawing.Size(66, 16);
+            this.FTPShare.Size = new System.Drawing.Size(126, 28);
             this.FTPShare.TabIndex = 188;
             this.FTPShare.Text = "FTP共享";
             this.FTPShare.UseVisualStyleBackColor = true;
@@ -287,18 +304,20 @@ namespace UAS_LabelMachine
             this.CodeSoft.AutoSize = true;
             this.CodeSoft.Enabled = false;
             this.CodeSoft.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CodeSoft.Location = new System.Drawing.Point(1058, 78);
+            this.CodeSoft.Location = new System.Drawing.Point(2116, 156);
+            this.CodeSoft.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.CodeSoft.Name = "CodeSoft";
-            this.CodeSoft.Size = new System.Drawing.Size(99, 25);
+            this.CodeSoft.Size = new System.Drawing.Size(189, 45);
             this.CodeSoft.TabIndex = 161;
             this.CodeSoft.Text = "CodeSoft";
             this.CodeSoft.UseVisualStyleBackColor = true;
             // 
             // pictureBox1
             // 
-            this.pictureBox1.Location = new System.Drawing.Point(918, 138);
+            this.pictureBox1.Location = new System.Drawing.Point(1836, 276);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(254, 300);
+            this.pictureBox1.Size = new System.Drawing.Size(508, 600);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pictureBox1.TabIndex = 191;
             this.pictureBox1.TabStop = false;
@@ -306,9 +325,12 @@ namespace UAS_LabelMachine
             // PortModel
             // 
             this.PortModel.AutoSize = true;
-            this.PortModel.Location = new System.Drawing.Point(923, 116);
+            this.PortModel.Checked = true;
+            this.PortModel.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.PortModel.Location = new System.Drawing.Point(1846, 232);
+            this.PortModel.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.PortModel.Name = "PortModel";
-            this.PortModel.Size = new System.Drawing.Size(96, 16);
+            this.PortModel.Size = new System.Drawing.Size(186, 28);
             this.PortModel.TabIndex = 193;
             this.PortModel.Text = "启用被动模式";
             this.PortModel.UseVisualStyleBackColor = true;
@@ -319,9 +341,10 @@ namespace UAS_LabelMachine
             this.BarTender.AutoSize = true;
             this.BarTender.Enabled = false;
             this.BarTender.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BarTender.Location = new System.Drawing.Point(1058, 110);
+            this.BarTender.Location = new System.Drawing.Point(2116, 220);
+            this.BarTender.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.BarTender.Name = "BarTender";
-            this.BarTender.Size = new System.Drawing.Size(106, 25);
+            this.BarTender.Size = new System.Drawing.Size(205, 45);
             this.BarTender.TabIndex = 194;
             this.BarTender.Text = "BarTender";
             this.BarTender.UseVisualStyleBackColor = true;
@@ -421,18 +444,19 @@ namespace UAS_LabelMachine
             // pagination1
             // 
             this.pagination1.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pagination1.Location = new System.Drawing.Point(0, 550);
-            this.pagination1.Margin = new System.Windows.Forms.Padding(4);
+            this.pagination1.Location = new System.Drawing.Point(0, 1100);
+            this.pagination1.Margin = new System.Windows.Forms.Padding(8);
             this.pagination1.Name = "pagination1";
-            this.pagination1.Size = new System.Drawing.Size(1179, 31);
+            this.pagination1.Size = new System.Drawing.Size(2358, 62);
             this.pagination1.TabIndex = 190;
             // 
             // NewLabel
             // 
             this.NewLabel.Image = ((System.Drawing.Image)(resources.GetObject("NewLabel.Image")));
-            this.NewLabel.Location = new System.Drawing.Point(846, 490);
+            this.NewLabel.Location = new System.Drawing.Point(1692, 980);
+            this.NewLabel.Margin = new System.Windows.Forms.Padding(6);
             this.NewLabel.Name = "NewLabel";
-            this.NewLabel.Size = new System.Drawing.Size(61, 24);
+            this.NewLabel.Size = new System.Drawing.Size(122, 48);
             this.NewLabel.TabIndex = 189;
             this.NewLabel.Tag = "IfWrite";
             this.NewLabel.Text = "新增标签";
@@ -442,9 +466,10 @@ namespace UAS_LabelMachine
             // NetURL
             // 
             this.NetURL.ID = null;
-            this.NetURL.Location = new System.Drawing.Point(1026, 49);
+            this.NetURL.Location = new System.Drawing.Point(2052, 98);
+            this.NetURL.Margin = new System.Windows.Forms.Padding(6);
             this.NetURL.Name = "NetURL";
-            this.NetURL.Size = new System.Drawing.Size(122, 21);
+            this.NetURL.Size = new System.Drawing.Size(240, 35);
             this.NetURL.Str = null;
             this.NetURL.Str1 = null;
             this.NetURL.Str2 = null;
@@ -459,13 +484,14 @@ namespace UAS_LabelMachine
             this.la_code.Condition = null;
             this.la_code.DBTitle = null;
             this.la_code.FormName = null;
-            this.la_code.Location = new System.Drawing.Point(659, 455);
+            this.la_code.Location = new System.Drawing.Point(1318, 910);
+            this.la_code.Margin = new System.Windows.Forms.Padding(6);
             this.la_code.Name = "la_code";
             this.la_code.Power = null;
             this.la_code.ReturnData = null;
             this.la_code.SelectField = null;
             this.la_code.SetValueField = null;
-            this.la_code.Size = new System.Drawing.Size(161, 21);
+            this.la_code.Size = new System.Drawing.Size(322, 42);
             this.la_code.TabIndex = 179;
             this.la_code.TableName = null;
             this.la_code.Tag = "la_code";
@@ -474,9 +500,10 @@ namespace UAS_LabelMachine
             // Save
             // 
             this.Save.Image = ((System.Drawing.Image)(resources.GetObject("Save.Image")));
-            this.Save.Location = new System.Drawing.Point(759, 491);
+            this.Save.Location = new System.Drawing.Point(1518, 982);
+            this.Save.Margin = new System.Windows.Forms.Padding(6);
             this.Save.Name = "Save";
-            this.Save.Size = new System.Drawing.Size(61, 24);
+            this.Save.Size = new System.Drawing.Size(122, 48);
             this.Save.TabIndex = 170;
             this.Save.Tag = "IfWrite";
             this.Save.Text = "保存";
@@ -485,19 +512,20 @@ namespace UAS_LabelMachine
             // 
             // ChooseAll
             // 
-            this.ChooseAll.Location = new System.Drawing.Point(19, 92);
+            this.ChooseAll.Location = new System.Drawing.Point(38, 184);
+            this.ChooseAll.Margin = new System.Windows.Forms.Padding(6);
             this.ChooseAll.Name = "ChooseAll";
-            this.ChooseAll.Size = new System.Drawing.Size(40, 21);
+            this.ChooseAll.Size = new System.Drawing.Size(80, 42);
             this.ChooseAll.TabIndex = 177;
             this.ChooseAll.Text = "全选";
             this.ChooseAll.UseVisualStyleBackColor = true;
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(1026, 22);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(4);
+            this.PrinterList.Location = new System.Drawing.Point(2052, 44);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(8);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(121, 20);
+            this.PrinterList.Size = new System.Drawing.Size(242, 40);
             this.PrinterList.TabIndex = 174;
             // 
             // LabelDataGridView
@@ -520,7 +548,8 @@ namespace UAS_LabelMachine
             this.cl_detno,
             this.cl_labelsoft,
             this.cl_status});
-            this.LabelDataGridView.Location = new System.Drawing.Point(17, 90);
+            this.LabelDataGridView.Location = new System.Drawing.Point(34, 180);
+            this.LabelDataGridView.Margin = new System.Windows.Forms.Padding(6);
             this.LabelDataGridView.Name = "LabelDataGridView";
             dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
             dataGridViewCellStyle1.BackColor = System.Drawing.Color.Blue;
@@ -534,7 +563,7 @@ namespace UAS_LabelMachine
             this.LabelDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle2;
             this.LabelDataGridView.RowTemplate.Height = 23;
             this.LabelDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.LabelDataGridView.Size = new System.Drawing.Size(890, 348);
+            this.LabelDataGridView.Size = new System.Drawing.Size(1780, 696);
             this.LabelDataGridView.TabIndex = 172;
             this.LabelDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelDataGridView_CellContentClick);
             this.LabelDataGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.LabelDataGridView_CellFormatting);
@@ -635,9 +664,10 @@ namespace UAS_LabelMachine
             // PrintTest
             // 
             this.PrintTest.Image = ((System.Drawing.Image)(resources.GetObject("PrintTest.Image")));
-            this.PrintTest.Location = new System.Drawing.Point(1016, 455);
+            this.PrintTest.Location = new System.Drawing.Point(2032, 910);
+            this.PrintTest.Margin = new System.Windows.Forms.Padding(6);
             this.PrintTest.Name = "PrintTest";
-            this.PrintTest.Size = new System.Drawing.Size(61, 24);
+            this.PrintTest.Size = new System.Drawing.Size(122, 48);
             this.PrintTest.TabIndex = 166;
             this.PrintTest.Tag = "Print";
             this.PrintTest.Text = "打印测试";
@@ -651,13 +681,14 @@ namespace UAS_LabelMachine
             this.客户编号.Condition = null;
             this.客户编号.DBTitle = null;
             this.客户编号.FormName = null;
-            this.客户编号.Location = new System.Drawing.Point(116, 453);
+            this.客户编号.Location = new System.Drawing.Point(232, 906);
+            this.客户编号.Margin = new System.Windows.Forms.Padding(6);
             this.客户编号.Name = "客户编号";
             this.客户编号.Power = null;
             this.客户编号.ReturnData = null;
             this.客户编号.SelectField = null;
             this.客户编号.SetValueField = null;
-            this.客户编号.Size = new System.Drawing.Size(136, 21);
+            this.客户编号.Size = new System.Drawing.Size(272, 42);
             this.客户编号.TabIndex = 168;
             this.客户编号.TableName = null;
             this.客户编号.Tag = "cu_code";
@@ -670,13 +701,14 @@ namespace UAS_LabelMachine
             this.cu_code.Condition = null;
             this.cu_code.DBTitle = null;
             this.cu_code.FormName = null;
-            this.cu_code.Location = new System.Drawing.Point(127, 16);
+            this.cu_code.Location = new System.Drawing.Point(254, 32);
+            this.cu_code.Margin = new System.Windows.Forms.Padding(6);
             this.cu_code.Name = "cu_code";
             this.cu_code.Power = null;
             this.cu_code.ReturnData = null;
             this.cu_code.SelectField = null;
             this.cu_code.SetValueField = null;
-            this.cu_code.Size = new System.Drawing.Size(150, 21);
+            this.cu_code.Size = new System.Drawing.Size(300, 42);
             this.cu_code.TabIndex = 159;
             this.cu_code.TableName = null;
             this.cu_code.Tag = "cl_custcode";
@@ -685,9 +717,10 @@ namespace UAS_LabelMachine
             // UpdateGrid
             // 
             this.UpdateGrid.Image = ((System.Drawing.Image)(resources.GetObject("UpdateGrid.Image")));
-            this.UpdateGrid.Location = new System.Drawing.Point(695, 49);
+            this.UpdateGrid.Location = new System.Drawing.Point(1390, 98);
+            this.UpdateGrid.Margin = new System.Windows.Forms.Padding(6);
             this.UpdateGrid.Name = "UpdateGrid";
-            this.UpdateGrid.Size = new System.Drawing.Size(61, 24);
+            this.UpdateGrid.Size = new System.Drawing.Size(122, 48);
             this.UpdateGrid.TabIndex = 154;
             this.UpdateGrid.Tag = "IfWrite";
             this.UpdateGrid.Text = "更新";
@@ -697,9 +730,10 @@ namespace UAS_LabelMachine
             // Screen
             // 
             this.Screen.Image = ((System.Drawing.Image)(resources.GetObject("Screen.Image")));
-            this.Screen.Location = new System.Drawing.Point(582, 49);
+            this.Screen.Location = new System.Drawing.Point(1164, 98);
+            this.Screen.Margin = new System.Windows.Forms.Padding(6);
             this.Screen.Name = "Screen";
-            this.Screen.Size = new System.Drawing.Size(61, 24);
+            this.Screen.Size = new System.Drawing.Size(122, 48);
             this.Screen.TabIndex = 153;
             this.Screen.Tag = "IfRead";
             this.Screen.Text = "筛选";
@@ -709,9 +743,10 @@ namespace UAS_LabelMachine
             // cu_name
             // 
             this.cu_name.ID = null;
-            this.cu_name.Location = new System.Drawing.Point(419, 16);
+            this.cu_name.Location = new System.Drawing.Point(838, 32);
+            this.cu_name.Margin = new System.Windows.Forms.Padding(6);
             this.cu_name.Name = "cu_name";
-            this.cu_name.Size = new System.Drawing.Size(150, 21);
+            this.cu_name.Size = new System.Drawing.Size(296, 35);
             this.cu_name.Str = null;
             this.cu_name.Str1 = null;
             this.cu_name.Str2 = null;
@@ -720,9 +755,9 @@ namespace UAS_LabelMachine
             // 
             // 客户标签维护
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1179, 581);
+            this.ClientSize = new System.Drawing.Size(2358, 1162);
             this.Controls.Add(this.BarTender);
             this.Controls.Add(this.PortModel);
             this.Controls.Add(this.pictureBox1);
@@ -758,6 +793,7 @@ namespace UAS_LabelMachine
             this.Controls.Add(this.cu_name);
             this.Controls.Add(this.cl_code_label);
             this.Controls.Add(this.cu_name_label);
+            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Name = "客户标签维护";
             this.Tag = "Make!CustLabel";
             this.Text = "客户标签维护";
@@ -766,7 +802,7 @@ namespace UAS_LabelMachine
             this.SizeChanged += new System.EventHandler(this.产品标签维护_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-出货标签管理(贸易版)/客户标签维护.cs

@@ -96,7 +96,7 @@ namespace UAS_LabelMachine
             }
             condition.Append("");
             ChooseAll.ChooseAll(LabelDataGridView);
-            PortModel.Checked = Settings.Default.FTPModel;
+            //PortModel.Checked = Settings.Default.FTPModel;
             BaseUtil.SetComboxData(la_type, "display", "value", labeltype);
             //加载下拉框的静态值
             LoadData();