修改配置，激活当前弹出窗体，修改调用存储过程字段长度

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

@@ -21,6 +21,7 @@ namespace UAS_LabelMachine
         public ExportColumns()
         {
             InitializeComponent();
+            Activate();
         }
 
         public ExportColumns(string IInoutno)
@@ -31,6 +32,8 @@ namespace UAS_LabelMachine
 
         private void ExportColumns_Load(object sender, EventArgs e)
         {
+            Activate();
+            LogicHandler.CustInit("0");
             LoadData();
         }
 

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

@@ -21,6 +21,7 @@ namespace UAS_LabelMachine
         public ExportExcel(string pi_inoutno)
         {
             InitializeComponent();
+     
             inoutno = pi_inoutno;
         }
 
@@ -125,7 +126,8 @@ namespace UAS_LabelMachine
 
         private void ExportExcel_Load(object sender, EventArgs e)
         {
-
+            Activate();
+            LogicHandler.CustInit("0");
         }
 
         private void ExportSetting_Click(object sender, EventArgs e)

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

@@ -11,30 +11,30 @@ namespace UAS_LabelMachine
     public class DataHelper
     {
 
-        ////深爱地址
-        //private readonly string ConnectionStrings = "Data Source=172.16.0.22/orcl;User ID=SZSI_TEST;PassWord=select!#%*(";
+        //深爱地址
+        private readonly string ConnectionStrings = "Data Source=172.16.0.22/orcl;User ID=SZSI_TEST;PassWord=select!#%*(";
 
-        //private readonly string IPConnectionStrings = "Data Source=172.16.0.22/orcl;User ID=SZSI_TEST;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.20|vsftpd|shenaftp";
+        private readonly string IPConnectionStrings = "Data Source=172.16.0.22/orcl;User ID=SZSI_TEST;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.20|vsftpd|shenaftp";
 
-        //public static readonly string InnerFTPAddress = "ftp://172.16.0.20|vsftpd|shenaftp";
-        ////Oracle端口
-        //public static readonly string OraclePort = "1521";
+        public static readonly string InnerFTPAddress = "ftp://172.16.0.20|vsftpd|shenaftp";
+        //Oracle端口
+        public static readonly string OraclePort = "1521";
 
-        private readonly string ConnectionStrings = "Data Source=cmityj.gicp.net/orcl;User ID=HC_TEST;PassWord=select!#%*(";
+        //private readonly string ConnectionStrings = "Data Source=cmityj.gicp.net/orcl;User ID=HC_TEST;PassWord=select!#%*(";
 
-        private readonly string IPConnectionStrings = "Data Source=183.237.197.78/orcl;User ID=HC_TEST;PassWord=select!#%*(";
-        //海创ERP地址
-        public static readonly string ERPAddesss = "http://cmityj.gicp.net:8099/ERP/";
-        //海创FTP
-        public static readonly string FTPAddress = "ftp://cmityj.gicp.net|HCFTP|Admin1@#";
+        //private readonly string IPConnectionStrings = "Data Source=183.237.197.78/orcl;User ID=HC_TEST;PassWord=select!#%*(";
+        ////海创ERP地址
+        //public static readonly string ERPAddesss = "http://cmityj.gicp.net:8099/ERP/";
+        ////海创FTP
+        //public static readonly string FTPAddress = "ftp://cmityj.gicp.net|HCFTP|Admin1@#";
 
-        public static readonly string InnerFTPAddress = "ftp://192.168.1.8|HCFTP|Admin1@#";
-        //Oracle端口
-        public static readonly string OraclePort = "1521";
+        //public static readonly string InnerFTPAddress = "ftp://192.168.1.8|HCFTP|Admin1@#";
+        ////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)));";
@@ -1119,7 +1119,7 @@ namespace UAS_LabelMachine
             command.CommandText = ProcedureName;
             command.CommandType = CommandType.StoredProcedure;
             for (int i = 0; i < param.Length; i++)
-                command.Parameters.Add(new OracleParameter(param[i].ToString(), OracleDbType.Varchar2, 1000, param[i], ParameterDirection.InputOutput));
+                command.Parameters.Add(new OracleParameter(param[i].ToString(), OracleDbType.Varchar2, 4000, param[i], ParameterDirection.InputOutput));
             try
             {
                 command.ExecuteNonQuery();

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

@@ -91,14 +91,14 @@
             this.pi_date = new System.Windows.Forms.Label();
             this.CleanBarCode = new System.Windows.Forms.Button();
             this.MenuSetting = new System.Windows.Forms.Button();
-            this.Menu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
-            this.下载模板ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.流水调整ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ShowMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.采集策略设置 = new System.Windows.Forms.ToolStripMenuItem();
+            this.附加信息设置 = new System.Windows.Forms.ToolStripMenuItem();
+            this.导出数据 = new System.Windows.Forms.ToolStripMenuItem();
+            this.标签维护 = new System.Windows.Forms.ToolStripMenuItem();
+            this.条码导入生成 = new System.Windows.Forms.ToolStripMenuItem();
+            this.下载模板 = new System.Windows.Forms.ToolStripMenuItem();
+            this.流水调整 = new System.Windows.Forms.ToolStripMenuItem();
             this.ImportExcel = new System.Windows.Forms.OpenFileDialog();
             this.pi_class = new System.Windows.Forms.Label();
             this.CustBarCode = new System.Windows.Forms.Button();
@@ -202,7 +202,7 @@
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
-            this.Menu.SuspendLayout();
+            this.ShowMenu.SuspendLayout();
             this.groupBoxWithBorder1.SuspendLayout();
             this.CollectionProcess.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.LabelInf)).BeginInit();
@@ -766,63 +766,63 @@
             this.MenuSetting.UseVisualStyleBackColor = true;
             this.MenuSetting.Click += new System.EventHandler(this.MenuSetting_Click);
             // 
-            // Menu
+            // ShowMenu
             // 
-            this.Menu.ImageScalingSize = new System.Drawing.Size(32, 32);
-            this.Menu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripMenuItem1,
-            this.toolStripMenuItem2,
-            this.toolStripMenuItem3,
-            this.toolStripMenuItem5,
-            this.toolStripMenuItem6,
-            this.下载模板ToolStripMenuItem,
-            this.流水调整ToolStripMenuItem});
-            this.Menu.Name = "Menu";
-            this.Menu.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            this.Menu.Size = new System.Drawing.Size(149, 158);
-            this.Menu.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.Menu_ItemClicked);
+            this.ShowMenu.ImageScalingSize = new System.Drawing.Size(32, 32);
+            this.ShowMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.采集策略设置,
+            this.附加信息设置,
+            this.导出数据,
+            this.标签维护,
+            this.条码导入生成,
+            this.下载模板,
+            this.流水调整});
+            this.ShowMenu.Name = "ShowMenu";
+            this.ShowMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+            this.ShowMenu.Size = new System.Drawing.Size(149, 158);
+            this.ShowMenu.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.Menu_ItemClicked);
             // 
-            // toolStripMenuItem1
+            // 采集策略设置
             // 
-            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(148, 22);
-            this.toolStripMenuItem1.Text = "采集策略设置";
+            this.采集策略设置.Name = "采集策略设置";
+            this.采集策略设置.Size = new System.Drawing.Size(148, 22);
+            this.采集策略设置.Text = "采集策略设置";
             // 
-            // toolStripMenuItem2
+            // 附加信息设置
             // 
-            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(148, 22);
-            this.toolStripMenuItem2.Text = "附加信息设置";
+            this.附加信息设置.Name = "附加信息设置";
+            this.附加信息设置.Size = new System.Drawing.Size(148, 22);
+            this.附加信息设置.Text = "附加信息设置";
             // 
-            // toolStripMenuItem3
+            // 导出数据
             // 
-            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(148, 22);
-            this.toolStripMenuItem3.Text = "导出数据";
+            this.导出数据.Name = "导出数据";
+            this.导出数据.Size = new System.Drawing.Size(148, 22);
+            this.导出数据.Text = "导出数据";
             // 
-            // toolStripMenuItem5
+            // 标签维护
             // 
-            this.toolStripMenuItem5.Name = "toolStripMenuItem5";
-            this.toolStripMenuItem5.Size = new System.Drawing.Size(148, 22);
-            this.toolStripMenuItem5.Text = "标签维护";
+            this.标签维护.Name = "标签维护";
+            this.标签维护.Size = new System.Drawing.Size(148, 22);
+            this.标签维护.Text = "标签维护";
             // 
-            // toolStripMenuItem6
+            // 条码导入生成
             // 
-            this.toolStripMenuItem6.Name = "toolStripMenuItem6";
-            this.toolStripMenuItem6.Size = new System.Drawing.Size(148, 22);
-            this.toolStripMenuItem6.Text = "条码导入生成";
+            this.条码导入生成.Name = "条码导入生成";
+            this.条码导入生成.Size = new System.Drawing.Size(148, 22);
+            this.条码导入生成.Text = "条码导入生成";
             // 
-            // 下载模板ToolStripMenuItem
+            // 下载模板
             // 
-            this.下载模板ToolStripMenuItem.Name = "下载模板ToolStripMenuItem";
-            this.下载模板ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
-            this.下载模板ToolStripMenuItem.Text = "下载模板";
+            this.下载模板.Name = "下载模板";
+            this.下载模板.Size = new System.Drawing.Size(148, 22);
+            this.下载模板.Text = "下载模板";
             // 
-            // 流水调整ToolStripMenuItem
+            // 流水调整
             // 
-            this.流水调整ToolStripMenuItem.Name = "流水调整ToolStripMenuItem";
-            this.流水调整ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
-            this.流水调整ToolStripMenuItem.Text = "流水调整";
+            this.流水调整.Name = "流水调整";
+            this.流水调整.Size = new System.Drawing.Size(148, 22);
+            this.流水调整.Text = "流水调整";
             // 
             // ImportExcel
             // 
@@ -1876,7 +1876,7 @@
             // LogingOut
             // 
             this.LogingOut.AutoSize = true;
-            this.LogingOut.Location = new System.Drawing.Point(99, 1);
+            this.LogingOut.Location = new System.Drawing.Point(112, 15);
             this.LogingOut.Name = "LogingOut";
             this.LogingOut.Size = new System.Drawing.Size(42, 21);
             this.LogingOut.TabIndex = 77;
@@ -2036,7 +2036,7 @@
             this.SizeChanged += new System.EventHandler(this.贴标机条码打印_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).EndInit();
-            this.Menu.ResumeLayout(false);
+            this.ShowMenu.ResumeLayout(false);
             this.groupBoxWithBorder1.ResumeLayout(false);
             this.groupBoxWithBorder1.PerformLayout();
             this.CollectionProcess.ResumeLayout(false);
@@ -2180,22 +2180,22 @@
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Label label19;
         private System.Windows.Forms.Button MenuSetting;
-        private System.Windows.Forms.ContextMenuStrip Menu;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5;
+        private System.Windows.Forms.ContextMenuStrip ShowMenu;
+        private System.Windows.Forms.ToolStripMenuItem 采集策略设置;
+        private System.Windows.Forms.ToolStripMenuItem 附加信息设置;
+        private System.Windows.Forms.ToolStripMenuItem 导出数据;
+        private System.Windows.Forms.ToolStripMenuItem 标签维护;
         private System.Windows.Forms.OpenFileDialog ImportExcel;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem6;
+        private System.Windows.Forms.ToolStripMenuItem 条码导入生成;
         private System.Windows.Forms.Label pi_class;
-        private System.Windows.Forms.ToolStripMenuItem 下载模板ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 下载模板;
         private System.Windows.Forms.CheckBox cu_print_outprod;
         private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder2;
         private System.Windows.Forms.CheckBox cu_print_outdc;
         private System.Windows.Forms.CheckBox cu_print_outlotno;
         private System.Windows.Forms.CheckBox cu_print_outpo;
         private System.Windows.Forms.Button CustBarCode;
-        private System.Windows.Forms.ToolStripMenuItem 流水调整ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 流水调整;
         private System.Windows.Forms.Button GetMidBoxCode;
         private System.Windows.Forms.CheckBox cu_print_ordercode;
         private System.Windows.Forms.CheckBox LabelSpace;

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

@@ -185,6 +185,8 @@ namespace UAS_LabelMachine
 
         private void 贴标机条码打印_Load(object sender, EventArgs e)
         {
+            ShowMenu.TopLevel = false;
+            ShowMenu.Parent = this;
             //杀死之前全部未关闭的进程
             Process[] processes = System.Diagnostics.Process.GetProcessesByName("lppa");
             Process[] processes1 = System.Diagnostics.Process.GetProcessesByName("bartend");
@@ -245,7 +247,6 @@ namespace UAS_LabelMachine
             MidLabelPrinter.Text = Properties.Settings.Default.MidPrinter;
             OutBoxPrinter.Text = Properties.Settings.Default.OutPrinter;
 
-
             asc.controllInitializeSize(this);
             asc.controlAutoSize(this);
             string Code = dh.GetConfig("PrintMethod", "CodeOrBar").ToString();
@@ -272,6 +273,7 @@ namespace UAS_LabelMachine
                 PrintMethod = "BarTender";
             }
             pi_inoutno.BringToFront();
+            LogicHandler.CustInit("0");
         }
 
         private void Sg_code_DbChange(object sender, EventArgs e)
@@ -301,6 +303,7 @@ namespace UAS_LabelMachine
 
         private void LabelFormClose(object sender, EventArgs e)
         {
+            Activate();
             if (GetGridOnly.Checked)
                 GetInOutInfAndLabelFile();
             else
@@ -2320,12 +2323,12 @@ namespace UAS_LabelMachine
 
         private void MenuSetting_Click(object sender, EventArgs e)
         {
-            Menu.Show(new Point(MenuSetting.Location.X, MenuSetting.Location.Y + 20));
+            ShowMenu.Show(new Point(MenuSetting.Location.X, MenuSetting.Location.Y + 20));
         }
 
         private void Menu_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
         {
-            Menu.Close();
+            ShowMenu.Close();
             DataTable dt;
             DialogResult result;
             switch (e.ClickedItem.Text)

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

@@ -147,7 +147,7 @@
   <metadata name="ExportFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>294, 17</value>
   </metadata>
-  <metadata name="Menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ShowMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>442, 17</value>
   </metadata>
   <metadata name="ImportExcel.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

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

@@ -80,6 +80,8 @@ namespace UAS_LabelMachine
         private void 条码维护_Load(object sender, EventArgs e)
         {
             dh = SystemInf.dh;
+            Activate();
+            LogicHandler.CustInit("0");
             if (Settings.Default.FTPAddress == "")
             {
                 FTPShare.Visible = false;