Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_PalletCollection.Designer.cs

@@ -41,6 +41,9 @@
             this.PrintLabel_label = new System.Windows.Forms.Label();
             this.PrinterList_label = new System.Windows.Forms.Label();
             this.PrintNum = new System.Windows.Forms.NumericUpDown();
+            this.pa_packageqty_label = new System.Windows.Forms.Label();
+            this.Packing = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.pa_standardqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.PrinterList = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
             this.pa_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -60,9 +63,6 @@
             this.pa_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_currentqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_outboxcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pa_standardqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pa_packageqty_label = new System.Windows.Forms.Label();
-            this.Packing = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PackageInf)).BeginInit();
             this.SuspendLayout();
@@ -71,10 +71,10 @@
             // 
             this.pa_outboxcode_label.AutoSize = true;
             this.pa_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_outboxcode_label.Location = new System.Drawing.Point(27, 34);
+            this.pa_outboxcode_label.Location = new System.Drawing.Point(30, 41);
             this.pa_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_outboxcode_label.Name = "pa_outboxcode_label";
-            this.pa_outboxcode_label.Size = new System.Drawing.Size(72, 27);
+            this.pa_outboxcode_label.Size = new System.Drawing.Size(86, 31);
             this.pa_outboxcode_label.TabIndex = 102;
             this.pa_outboxcode_label.Text = "栈板号";
             // 
@@ -82,10 +82,10 @@
             // 
             this.pa_totalqty_label.AutoSize = true;
             this.pa_totalqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty_label.Location = new System.Drawing.Point(313, 96);
+            this.pa_totalqty_label.Location = new System.Drawing.Point(352, 115);
             this.pa_totalqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_totalqty_label.Name = "pa_totalqty_label";
-            this.pa_totalqty_label.Size = new System.Drawing.Size(92, 27);
+            this.pa_totalqty_label.Size = new System.Drawing.Size(110, 31);
             this.pa_totalqty_label.TabIndex = 104;
             this.pa_totalqty_label.Text = "已装数量";
             // 
@@ -93,10 +93,10 @@
             // 
             this.pa_makecode_label.AutoSize = true;
             this.pa_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode_label.Location = new System.Drawing.Point(313, 34);
+            this.pa_makecode_label.Location = new System.Drawing.Point(352, 41);
             this.pa_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_makecode_label.Name = "pa_makecode_label";
-            this.pa_makecode_label.Size = new System.Drawing.Size(92, 27);
+            this.pa_makecode_label.Size = new System.Drawing.Size(110, 31);
             this.pa_makecode_label.TabIndex = 108;
             this.pa_makecode_label.Text = "制造单号";
             // 
@@ -104,10 +104,10 @@
             // 
             this.pa_restqty_label.AutoSize = true;
             this.pa_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_restqty_label.Location = new System.Drawing.Point(980, 160);
+            this.pa_restqty_label.Location = new System.Drawing.Point(1102, 192);
             this.pa_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_restqty_label.Name = "pa_restqty_label";
-            this.pa_restqty_label.Size = new System.Drawing.Size(92, 27);
+            this.pa_restqty_label.Size = new System.Drawing.Size(110, 31);
             this.pa_restqty_label.TabIndex = 154;
             this.pa_restqty_label.Text = "打印张数";
             // 
@@ -115,10 +115,10 @@
             // 
             this.pa_custcode_label.AutoSize = true;
             this.pa_custcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_custcode_label.Location = new System.Drawing.Point(980, 34);
+            this.pa_custcode_label.Location = new System.Drawing.Point(1102, 41);
             this.pa_custcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_custcode_label.Name = "pa_custcode_label";
-            this.pa_custcode_label.Size = new System.Drawing.Size(52, 27);
+            this.pa_custcode_label.Size = new System.Drawing.Size(62, 31);
             this.pa_custcode_label.TabIndex = 157;
             this.pa_custcode_label.Text = "客户";
             // 
@@ -126,10 +126,10 @@
             // 
             this.palletcode_label.AutoSize = true;
             this.palletcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.palletcode_label.Location = new System.Drawing.Point(980, 308);
+            this.palletcode_label.Location = new System.Drawing.Point(1102, 370);
             this.palletcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.palletcode_label.Name = "palletcode_label";
-            this.palletcode_label.Size = new System.Drawing.Size(72, 27);
+            this.palletcode_label.Size = new System.Drawing.Size(86, 31);
             this.palletcode_label.TabIndex = 165;
             this.palletcode_label.Text = "栈板号";
             // 
@@ -137,10 +137,10 @@
             // 
             this.outboxcode_label.AutoSize = true;
             this.outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.outboxcode_label.Location = new System.Drawing.Point(980, 363);
+            this.outboxcode_label.Location = new System.Drawing.Point(1102, 436);
             this.outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.outboxcode_label.Name = "outboxcode_label";
-            this.outboxcode_label.Size = new System.Drawing.Size(52, 27);
+            this.outboxcode_label.Size = new System.Drawing.Size(62, 31);
             this.outboxcode_label.TabIndex = 166;
             this.outboxcode_label.Text = "箱号";
             // 
@@ -148,10 +148,10 @@
             // 
             this.pa_prodcode_label.AutoSize = true;
             this.pa_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode_label.Location = new System.Drawing.Point(604, 34);
+            this.pa_prodcode_label.Location = new System.Drawing.Point(680, 41);
             this.pa_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_prodcode_label.Name = "pa_prodcode_label";
-            this.pa_prodcode_label.Size = new System.Drawing.Size(92, 27);
+            this.pa_prodcode_label.Size = new System.Drawing.Size(110, 31);
             this.pa_prodcode_label.TabIndex = 169;
             this.pa_prodcode_label.Text = "产品编号";
             // 
@@ -159,20 +159,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1105, 101);
+            this.PrintLabel.Location = new System.Drawing.Point(1243, 121);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(195, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(219, 26);
             this.PrintLabel.TabIndex = 172;
             // 
             // PrintLabel_label
             // 
             this.PrintLabel_label.AutoSize = true;
             this.PrintLabel_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintLabel_label.Location = new System.Drawing.Point(980, 99);
+            this.PrintLabel_label.Location = new System.Drawing.Point(1102, 119);
             this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintLabel_label.Name = "PrintLabel_label";
-            this.PrintLabel_label.Size = new System.Drawing.Size(92, 27);
+            this.PrintLabel_label.Size = new System.Drawing.Size(110, 31);
             this.PrintLabel_label.TabIndex = 174;
             this.PrintLabel_label.Text = "标签文件";
             // 
@@ -180,19 +180,19 @@
             // 
             this.PrinterList_label.AutoSize = true;
             this.PrinterList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrinterList_label.Location = new System.Drawing.Point(604, 99);
+            this.PrinterList_label.Location = new System.Drawing.Point(680, 119);
             this.PrinterList_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrinterList_label.Name = "PrinterList_label";
-            this.PrinterList_label.Size = new System.Drawing.Size(112, 27);
+            this.PrinterList_label.Size = new System.Drawing.Size(134, 31);
             this.PrinterList_label.TabIndex = 173;
             this.PrinterList_label.Text = "打印机列表";
             // 
             // PrintNum
             // 
-            this.PrintNum.Location = new System.Drawing.Point(1105, 161);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
+            this.PrintNum.Location = new System.Drawing.Point(1243, 193);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.PrintNum.Name = "PrintNum";
-            this.PrintNum.Size = new System.Drawing.Size(196, 25);
+            this.PrintNum.Size = new System.Drawing.Size(220, 28);
             this.PrintNum.TabIndex = 175;
             this.PrintNum.Value = new decimal(new int[] {
             1,
@@ -200,12 +200,55 @@
             0,
             0});
             // 
+            // pa_packageqty_label
+            // 
+            this.pa_packageqty_label.AutoSize = true;
+            this.pa_packageqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_packageqty_label.Location = new System.Drawing.Point(30, 115);
+            this.pa_packageqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_packageqty_label.Name = "pa_packageqty_label";
+            this.pa_packageqty_label.Size = new System.Drawing.Size(110, 31);
+            this.pa_packageqty_label.TabIndex = 176;
+            this.pa_packageqty_label.Text = "箱内容量";
+            // 
+            // Packing
+            // 
+            this.Packing.AllPower = null;
+            this.Packing.BackColor = System.Drawing.Color.Transparent;
+            this.Packing.DownImage = ((System.Drawing.Image)(resources.GetObject("Packing.DownImage")));
+            this.Packing.Image = ((System.Drawing.Image)(resources.GetObject("Packing.Image")));
+            this.Packing.IsShowBorder = true;
+            this.Packing.Location = new System.Drawing.Point(1314, 318);
+            this.Packing.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Packing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Packing.MoveImage")));
+            this.Packing.Name = "Packing";
+            this.Packing.NormalImage = ((System.Drawing.Image)(resources.GetObject("Packing.NormalImage")));
+            this.Packing.Power = null;
+            this.Packing.Size = new System.Drawing.Size(90, 36);
+            this.Packing.TabIndex = 178;
+            this.Packing.Text = "封栈板";
+            this.Packing.UseVisualStyleBackColor = true;
+            this.Packing.Click += new System.EventHandler(this.Packing_Click);
+            // 
+            // pa_standardqty
+            // 
+            this.pa_standardqty.AutoSize = true;
+            this.pa_standardqty.CutLength = null;
+            this.pa_standardqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_standardqty.Location = new System.Drawing.Point(177, 115);
+            this.pa_standardqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_standardqty.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pa_standardqty.Name = "pa_standardqty";
+            this.pa_standardqty.Size = new System.Drawing.Size(0, 31);
+            this.pa_standardqty.TabIndex = 177;
+            this.pa_standardqty.Tag = "1";
+            // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(751, 99);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(5);
+            this.PrinterList.Location = new System.Drawing.Point(845, 119);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(6);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(195, 25);
+            this.PrinterList.Size = new System.Drawing.Size(219, 30);
             this.PrinterList.TabIndex = 171;
             // 
             // pa_prodcode
@@ -213,11 +256,11 @@
             this.pa_prodcode.AutoSize = true;
             this.pa_prodcode.CutLength = null;
             this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode.Location = new System.Drawing.Point(745, 34);
+            this.pa_prodcode.Location = new System.Drawing.Point(838, 41);
             this.pa_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_prodcode.MaximumSize = new System.Drawing.Size(225, 0);
             this.pa_prodcode.Name = "pa_prodcode";
-            this.pa_prodcode.Size = new System.Drawing.Size(0, 27);
+            this.pa_prodcode.Size = new System.Drawing.Size(0, 31);
             this.pa_prodcode.TabIndex = 170;
             this.pa_prodcode.Tag = "1";
             // 
@@ -228,13 +271,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1105, 637);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4);
+            this.Clean.Location = new System.Drawing.Point(1243, 764);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(80, 30);
+            this.Clean.Size = new System.Drawing.Size(90, 36);
             this.Clean.TabIndex = 168;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -243,10 +286,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(953, 409);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(1072, 491);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(368, 220);
+            this.OperateResult.Size = new System.Drawing.Size(414, 263);
             this.OperateResult.TabIndex = 167;
             this.OperateResult.Text = "";
             // 
@@ -255,11 +298,11 @@
             this.outboxcode.AllPower = "ifall";
             this.outboxcode.BackColor = System.Drawing.Color.White;
             this.outboxcode.ID = null;
-            this.outboxcode.Location = new System.Drawing.Point(1106, 363);
-            this.outboxcode.Margin = new System.Windows.Forms.Padding(4);
+            this.outboxcode.Location = new System.Drawing.Point(1244, 436);
+            this.outboxcode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = "ifwrite";
-            this.outboxcode.Size = new System.Drawing.Size(195, 25);
+            this.outboxcode.Size = new System.Drawing.Size(219, 28);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
             this.outboxcode.Str2 = null;
@@ -272,11 +315,11 @@
             this.palletcode.AllPower = "ifall";
             this.palletcode.BackColor = System.Drawing.Color.White;
             this.palletcode.ID = null;
-            this.palletcode.Location = new System.Drawing.Point(1106, 308);
-            this.palletcode.Margin = new System.Windows.Forms.Padding(4);
+            this.palletcode.Location = new System.Drawing.Point(1244, 370);
+            this.palletcode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.palletcode.Name = "palletcode";
             this.palletcode.Power = "ifwrite";
-            this.palletcode.Size = new System.Drawing.Size(195, 25);
+            this.palletcode.Size = new System.Drawing.Size(219, 28);
             this.palletcode.Str = null;
             this.palletcode.Str1 = null;
             this.palletcode.Str2 = null;
@@ -291,13 +334,13 @@
             this.Printlab.DownImage = ((System.Drawing.Image)(resources.GetObject("Printlab.DownImage")));
             this.Printlab.Image = ((System.Drawing.Image)(resources.GetObject("Printlab.Image")));
             this.Printlab.IsShowBorder = true;
-            this.Printlab.Location = new System.Drawing.Point(1168, 209);
-            this.Printlab.Margin = new System.Windows.Forms.Padding(4);
+            this.Printlab.Location = new System.Drawing.Point(1314, 251);
+            this.Printlab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Printlab.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printlab.MoveImage")));
             this.Printlab.Name = "Printlab";
             this.Printlab.NormalImage = ((System.Drawing.Image)(resources.GetObject("Printlab.NormalImage")));
             this.Printlab.Power = null;
-            this.Printlab.Size = new System.Drawing.Size(80, 30);
+            this.Printlab.Size = new System.Drawing.Size(90, 36);
             this.Printlab.TabIndex = 161;
             this.Printlab.Text = "打印";
             this.Printlab.UseVisualStyleBackColor = true;
@@ -310,13 +353,13 @@
             this.ReleasePallet.DownImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.DownImage")));
             this.ReleasePallet.Image = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.Image")));
             this.ReleasePallet.IsShowBorder = true;
-            this.ReleasePallet.Location = new System.Drawing.Point(1041, 265);
-            this.ReleasePallet.Margin = new System.Windows.Forms.Padding(4);
+            this.ReleasePallet.Location = new System.Drawing.Point(1171, 318);
+            this.ReleasePallet.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ReleasePallet.MoveImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.MoveImage")));
             this.ReleasePallet.Name = "ReleasePallet";
             this.ReleasePallet.NormalImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.NormalImage")));
             this.ReleasePallet.Power = null;
-            this.ReleasePallet.Size = new System.Drawing.Size(80, 30);
+            this.ReleasePallet.Size = new System.Drawing.Size(90, 36);
             this.ReleasePallet.TabIndex = 160;
             this.ReleasePallet.Text = "解除栈板";
             this.ReleasePallet.UseVisualStyleBackColor = true;
@@ -329,13 +372,13 @@
             this.NewPalletCode.DownImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.DownImage")));
             this.NewPalletCode.Image = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.Image")));
             this.NewPalletCode.IsShowBorder = true;
-            this.NewPalletCode.Location = new System.Drawing.Point(1041, 209);
-            this.NewPalletCode.Margin = new System.Windows.Forms.Padding(4);
+            this.NewPalletCode.Location = new System.Drawing.Point(1171, 251);
+            this.NewPalletCode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.NewPalletCode.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.MoveImage")));
             this.NewPalletCode.Name = "NewPalletCode";
             this.NewPalletCode.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.NormalImage")));
             this.NewPalletCode.Power = "ifwrite";
-            this.NewPalletCode.Size = new System.Drawing.Size(80, 30);
+            this.NewPalletCode.Size = new System.Drawing.Size(90, 36);
             this.NewPalletCode.TabIndex = 159;
             this.NewPalletCode.Text = "新增栈板";
             this.NewPalletCode.UseVisualStyleBackColor = true;
@@ -346,11 +389,11 @@
             this.pa_custcode.AutoSize = true;
             this.pa_custcode.CutLength = null;
             this.pa_custcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_custcode.Location = new System.Drawing.Point(1105, 34);
+            this.pa_custcode.Location = new System.Drawing.Point(1243, 41);
             this.pa_custcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_custcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_custcode.MaximumSize = new System.Drawing.Size(225, 0);
             this.pa_custcode.Name = "pa_custcode";
-            this.pa_custcode.Size = new System.Drawing.Size(0, 27);
+            this.pa_custcode.Size = new System.Drawing.Size(0, 31);
             this.pa_custcode.TabIndex = 158;
             this.pa_custcode.Tag = "1";
             // 
@@ -364,11 +407,11 @@
             this.Column3,
             this.Column4,
             this.Column5});
-            this.PackageInf.Location = new System.Drawing.Point(4, 161);
-            this.PackageInf.Margin = new System.Windows.Forms.Padding(4);
+            this.PackageInf.Location = new System.Drawing.Point(4, 193);
+            this.PackageInf.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.PackageInf.Name = "PackageInf";
             this.PackageInf.RowTemplate.Height = 23;
-            this.PackageInf.Size = new System.Drawing.Size(941, 519);
+            this.PackageInf.Size = new System.Drawing.Size(1059, 623);
             this.PackageInf.TabIndex = 156;
             // 
             // pd_outboxcode
@@ -412,11 +455,11 @@
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.CutLength = null;
             this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode.Location = new System.Drawing.Point(439, 34);
+            this.pa_makecode.Location = new System.Drawing.Point(494, 41);
             this.pa_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_makecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_makecode.MaximumSize = new System.Drawing.Size(225, 0);
             this.pa_makecode.Name = "pa_makecode";
-            this.pa_makecode.Size = new System.Drawing.Size(0, 27);
+            this.pa_makecode.Size = new System.Drawing.Size(0, 31);
             this.pa_makecode.TabIndex = 109;
             this.pa_makecode.Tag = "1";
             // 
@@ -425,11 +468,11 @@
             this.pa_currentqty.AutoSize = true;
             this.pa_currentqty.CutLength = null;
             this.pa_currentqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty.Location = new System.Drawing.Point(439, 96);
+            this.pa_currentqty.Location = new System.Drawing.Point(494, 115);
             this.pa_currentqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_currentqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_currentqty.MaximumSize = new System.Drawing.Size(225, 0);
             this.pa_currentqty.Name = "pa_currentqty";
-            this.pa_currentqty.Size = new System.Drawing.Size(0, 27);
+            this.pa_currentqty.Size = new System.Drawing.Size(0, 31);
             this.pa_currentqty.TabIndex = 105;
             this.pa_currentqty.Tag = "1";
             // 
@@ -438,62 +481,19 @@
             this.pa_outboxcode.AutoSize = true;
             this.pa_outboxcode.CutLength = null;
             this.pa_outboxcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_outboxcode.Location = new System.Drawing.Point(157, 34);
+            this.pa_outboxcode.Location = new System.Drawing.Point(177, 41);
             this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_outboxcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_outboxcode.MaximumSize = new System.Drawing.Size(225, 0);
             this.pa_outboxcode.Name = "pa_outboxcode";
-            this.pa_outboxcode.Size = new System.Drawing.Size(0, 27);
+            this.pa_outboxcode.Size = new System.Drawing.Size(0, 31);
             this.pa_outboxcode.TabIndex = 103;
             this.pa_outboxcode.Tag = "1";
             // 
-            // pa_standardqty
-            // 
-            this.pa_standardqty.AutoSize = true;
-            this.pa_standardqty.CutLength = null;
-            this.pa_standardqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_standardqty.Location = new System.Drawing.Point(157, 96);
-            this.pa_standardqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_standardqty.MaximumSize = new System.Drawing.Size(200, 0);
-            this.pa_standardqty.Name = "pa_standardqty";
-            this.pa_standardqty.Size = new System.Drawing.Size(0, 27);
-            this.pa_standardqty.TabIndex = 177;
-            this.pa_standardqty.Tag = "1";
-            // 
-            // pa_packageqty_label
-            // 
-            this.pa_packageqty_label.AutoSize = true;
-            this.pa_packageqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_packageqty_label.Location = new System.Drawing.Point(27, 96);
-            this.pa_packageqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_packageqty_label.Name = "pa_packageqty_label";
-            this.pa_packageqty_label.Size = new System.Drawing.Size(92, 27);
-            this.pa_packageqty_label.TabIndex = 176;
-            this.pa_packageqty_label.Text = "箱内容量";
-            // 
-            // Packing
-            // 
-            this.Packing.AllPower = null;
-            this.Packing.BackColor = System.Drawing.Color.Transparent;
-            this.Packing.DownImage = ((System.Drawing.Image)(resources.GetObject("Packing.DownImage")));
-            this.Packing.Image = ((System.Drawing.Image)(resources.GetObject("Packing.Image")));
-            this.Packing.IsShowBorder = true;
-            this.Packing.Location = new System.Drawing.Point(1168, 265);
-            this.Packing.Margin = new System.Windows.Forms.Padding(4);
-            this.Packing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Packing.MoveImage")));
-            this.Packing.Name = "Packing";
-            this.Packing.NormalImage = ((System.Drawing.Image)(resources.GetObject("Packing.NormalImage")));
-            this.Packing.Power = null;
-            this.Packing.Size = new System.Drawing.Size(80, 30);
-            this.Packing.TabIndex = 178;
-            this.Packing.Text = "封展板";
-            this.Packing.UseVisualStyleBackColor = true;
-            this.Packing.Click += new System.EventHandler(this.Packing_Click);
-            // 
             // Make_PalletCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1329, 690);
+            this.ClientSize = new System.Drawing.Size(1495, 828);
             this.Controls.Add(this.Packing);
             this.Controls.Add(this.pa_standardqty);
             this.Controls.Add(this.pa_packageqty_label);
@@ -524,7 +524,7 @@
             this.Controls.Add(this.pa_outboxcode);
             this.Controls.Add(this.pa_outboxcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Name = "Make_PalletCollection";
             this.Tag = "Make!BigBoxCollection";
             this.Text = "栈板采集";

UAS-MES/FunctionCode/Make/Make_PalletCollection.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="Clean.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Packing.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -130,7 +130,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="Clean.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Packing.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -223,7 +223,7 @@
         2BFABjsCSFC++DdnYZod1cA/NQAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="Clean.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Packing.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -236,7 +236,7 @@
         gg==
 </value>
   </data>
-  <data name="Clean.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Packing.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
@@ -249,7 +249,7 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="Printlab.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Clean.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -261,7 +261,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="Printlab.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Clean.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -354,7 +354,7 @@
         2BFABjsCSFC++DdnYZod1cA/NQAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="Printlab.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Clean.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -367,7 +367,7 @@
         gg==
 </value>
   </data>
-  <data name="Printlab.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Clean.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
@@ -380,7 +380,7 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="ReleasePallet.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Printlab.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -392,7 +392,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="ReleasePallet.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Printlab.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -485,7 +485,7 @@
         2BFABjsCSFC++DdnYZod1cA/NQAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="ReleasePallet.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Printlab.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -498,7 +498,7 @@
         gg==
 </value>
   </data>
-  <data name="ReleasePallet.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="Printlab.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
@@ -511,7 +511,7 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="NewPalletCode.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ReleasePallet.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -523,7 +523,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="NewPalletCode.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ReleasePallet.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -616,7 +616,7 @@
         2BFABjsCSFC++DdnYZod1cA/NQAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="NewPalletCode.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ReleasePallet.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -629,7 +629,7 @@
         gg==
 </value>
   </data>
-  <data name="NewPalletCode.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ReleasePallet.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
@@ -642,22 +642,7 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="pd_outboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_innerqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="Packing.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NewPalletCode.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -669,7 +654,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="Packing.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NewPalletCode.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -762,7 +747,7 @@
         2BFABjsCSFC++DdnYZod1cA/NQAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="Packing.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NewPalletCode.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -775,7 +760,7 @@
         gg==
 </value>
   </data>
-  <data name="Packing.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NewPalletCode.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
@@ -788,4 +773,19 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
+  <metadata name="pd_outboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pd_innerqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

UAS_KanBan/BaseForm.cs

@@ -1,13 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-namespace UAS_KanBan
+namespace UAS_KanBan
 {
     public partial class BaseForm : CCWin.CCSkinMain
     {

UAS_KanBan/DataHelper.cs

@@ -2,9 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace UAS_KanBan
 {
@@ -31,7 +29,7 @@ namespace UAS_KanBan
                     connection = new OracleConnection(DBConnectionString);
                 connection.Open();
             }
-            catch (Exception e) { }
+            catch (Exception) { }
         }
 
         /// <summary>

UAS_KanBan/Process.Designer.cs

@@ -47,15 +47,18 @@
             this.WorkShift_label = new CCWin.SkinControl.SkinLabel();
             this.Logo = new CCWin.SkinControl.SkinPictureBox();
             this.投入 = new CCWin.SkinControl.SkinLabel();
-            this.产出 = new CCWin.SkinControl.SkinLabel();
+            this.一次通过 = new CCWin.SkinControl.SkinLabel();
             this.收益率 = new CCWin.SkinControl.SkinLabel();
             this.故障数 = new CCWin.SkinControl.SkinLabel();
             this.直通率 = new CCWin.SkinControl.SkinLabel();
             this.班次 = new CCWin.SkinControl.SkinLabel();
             this.Line = new CCWin.SkinControl.SkinLabel();
             this.Title2 = new CCWin.SkinControl.SkinLabel();
-            this.Refresh = new System.Windows.Forms.Timer(this.components);
+            this.RefreshData = new System.Windows.Forms.Timer(this.components);
             this.机型 = new UAS_KanBan.CustomControl.ValueLabel();
+            this.产出 = new CCWin.SkinControl.SkinLabel();
+            this.Dash = new CCWin.SkinControl.SkinLabel();
+            this.wccode = new CCWin.SkinControl.SkinLabel();
             ((System.ComponentModel.ISupportInitialize)(this.Logo)).BeginInit();
             this.SuspendLayout();
             // 
@@ -72,7 +75,7 @@
             this.TopLine.MouseBack = null;
             this.TopLine.Name = "TopLine";
             this.TopLine.NormlBack = null;
-            this.TopLine.Size = new System.Drawing.Size(1285, 2);
+            this.TopLine.Size = new System.Drawing.Size(1306, 2);
             this.TopLine.TabIndex = 0;
             // 
             // BottomLine
@@ -88,7 +91,7 @@
             this.BottomLine.MouseBack = null;
             this.BottomLine.Name = "BottomLine";
             this.BottomLine.NormlBack = null;
-            this.BottomLine.Size = new System.Drawing.Size(1285, 2);
+            this.BottomLine.Size = new System.Drawing.Size(1306, 2);
             this.BottomLine.TabIndex = 1;
             // 
             // Line1
@@ -127,12 +130,12 @@
             this.MidLine.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.MidLine.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.MidLine.DownBack = null;
-            this.MidLine.Location = new System.Drawing.Point(1021, 101);
+            this.MidLine.Location = new System.Drawing.Point(1020, 101);
             this.MidLine.Margin = new System.Windows.Forms.Padding(4);
             this.MidLine.MouseBack = null;
             this.MidLine.Name = "MidLine";
             this.MidLine.NormlBack = null;
-            this.MidLine.Size = new System.Drawing.Size(268, 2);
+            this.MidLine.Size = new System.Drawing.Size(289, 2);
             this.MidLine.TabIndex = 2;
             // 
             // Title
@@ -191,10 +194,10 @@
             this.产出_label.Location = new System.Drawing.Point(9, 648);
             this.产出_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.产出_label.Name = "产出_label";
-            this.产出_label.Size = new System.Drawing.Size(290, 84);
+            this.产出_label.Size = new System.Drawing.Size(375, 84);
             this.产出_label.TabIndex = 9;
             this.产出_label.Tag = "AutoFont";
-            this.产出_label.Text = "总产出";
+            this.产出_label.Text = "一次通过";
             // 
             // 投入_label
             // 
@@ -207,10 +210,10 @@
             this.投入_label.Location = new System.Drawing.Point(9, 491);
             this.投入_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.投入_label.Name = "投入_label";
-            this.投入_label.Size = new System.Drawing.Size(290, 84);
+            this.投入_label.Size = new System.Drawing.Size(418, 84);
             this.投入_label.TabIndex = 10;
             this.投入_label.Tag = "AutoFont";
-            this.投入_label.Text = "总投入";
+            this.投入_label.Text = "投入/产出";
             // 
             // 收益率_label
             // 
@@ -220,7 +223,7 @@
             this.收益率_label.BackColor = System.Drawing.Color.Transparent;
             this.收益率_label.BorderColor = System.Drawing.Color.White;
             this.收益率_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
-            this.收益率_label.Location = new System.Drawing.Point(792, 491);
+            this.收益率_label.Location = new System.Drawing.Point(829, 491);
             this.收益率_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.收益率_label.Name = "收益率_label";
             this.收益率_label.Size = new System.Drawing.Size(290, 84);
@@ -236,7 +239,7 @@
             this.故障数_label.BackColor = System.Drawing.Color.Transparent;
             this.故障数_label.BorderColor = System.Drawing.Color.White;
             this.故障数_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
-            this.故障数_label.Location = new System.Drawing.Point(792, 648);
+            this.故障数_label.Location = new System.Drawing.Point(829, 648);
             this.故障数_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.故障数_label.Name = "故障数_label";
             this.故障数_label.Size = new System.Drawing.Size(290, 84);
@@ -252,7 +255,7 @@
             this.直通率_label.BackColor = System.Drawing.Color.Transparent;
             this.直通率_label.BorderColor = System.Drawing.Color.White;
             this.直通率_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
-            this.直通率_label.Location = new System.Drawing.Point(792, 331);
+            this.直通率_label.Location = new System.Drawing.Point(829, 331);
             this.直通率_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.直通率_label.Name = "直通率_label";
             this.直通率_label.Size = new System.Drawing.Size(460, 84);
@@ -316,23 +319,24 @@
             this.投入.Size = new System.Drawing.Size(0, 87);
             this.投入.TabIndex = 19;
             this.投入.Tag = "AutoFont";
+            this.投入.SizeChanged += new System.EventHandler(this.投入_SizeChanged);
             // 
-            // 产出
+            // 一次通过
             // 
-            this.产出.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.一次通过.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
-            this.产出.AutoSize = true;
-            this.产出.BackColor = System.Drawing.Color.Transparent;
-            this.产出.BorderColor = System.Drawing.Color.Red;
-            this.产出.BorderSize = 0;
-            this.产出.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.产出.ForeColor = System.Drawing.Color.Red;
-            this.产出.Location = new System.Drawing.Point(453, 648);
-            this.产出.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.产出.Name = "产出";
-            this.产出.Size = new System.Drawing.Size(0, 87);
-            this.产出.TabIndex = 18;
-            this.产出.Tag = "AutoFont";
+            this.一次通过.AutoSize = true;
+            this.一次通过.BackColor = System.Drawing.Color.Transparent;
+            this.一次通过.BorderColor = System.Drawing.Color.Red;
+            this.一次通过.BorderSize = 0;
+            this.一次通过.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
+            this.一次通过.ForeColor = System.Drawing.Color.Red;
+            this.一次通过.Location = new System.Drawing.Point(453, 648);
+            this.一次通过.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.一次通过.Name = "一次通过";
+            this.一次通过.Size = new System.Drawing.Size(0, 87);
+            this.一次通过.TabIndex = 18;
+            this.一次通过.Tag = "AutoFont";
             // 
             // 收益率
             // 
@@ -344,7 +348,7 @@
             this.收益率.BorderSize = 0;
             this.收益率.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.收益率.ForeColor = System.Drawing.Color.Red;
-            this.收益率.Location = new System.Drawing.Point(1138, 491);
+            this.收益率.Location = new System.Drawing.Point(1175, 491);
             this.收益率.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.收益率.Name = "收益率";
             this.收益率.Size = new System.Drawing.Size(0, 87);
@@ -361,7 +365,7 @@
             this.故障数.BorderSize = 0;
             this.故障数.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.故障数.ForeColor = System.Drawing.Color.Red;
-            this.故障数.Location = new System.Drawing.Point(1138, 648);
+            this.故障数.Location = new System.Drawing.Point(1175, 648);
             this.故障数.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.故障数.Name = "故障数";
             this.故障数.Size = new System.Drawing.Size(0, 87);
@@ -378,7 +382,7 @@
             this.直通率.BorderSize = 0;
             this.直通率.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
             this.直通率.ForeColor = System.Drawing.Color.Red;
-            this.直通率.Location = new System.Drawing.Point(1138, 331);
+            this.直通率.Location = new System.Drawing.Point(1175, 331);
             this.直通率.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.直通率.Name = "直通率";
             this.直通率.Size = new System.Drawing.Size(0, 87);
@@ -420,7 +424,7 @@
             this.Title2.BackColor = System.Drawing.Color.Transparent;
             this.Title2.BorderColor = System.Drawing.Color.White;
             this.Title2.Font = new System.Drawing.Font("宋体", 45F);
-            this.Title2.Location = new System.Drawing.Point(356, 201);
+            this.Title2.Location = new System.Drawing.Point(377, 201);
             this.Title2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Title2.Name = "Title2";
             this.Title2.Size = new System.Drawing.Size(670, 75);
@@ -442,12 +446,65 @@
             this.机型.TabIndex = 17;
             this.机型.Tag = "AutoFont";
             // 
+            // 产出
+            // 
+            this.产出.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.产出.AutoSize = true;
+            this.产出.BackColor = System.Drawing.Color.Transparent;
+            this.产出.BorderColor = System.Drawing.Color.Red;
+            this.产出.BorderSize = 0;
+            this.产出.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
+            this.产出.ForeColor = System.Drawing.Color.Red;
+            this.产出.Location = new System.Drawing.Point(537, 491);
+            this.产出.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.产出.Name = "产出";
+            this.产出.Size = new System.Drawing.Size(0, 87);
+            this.产出.TabIndex = 26;
+            this.产出.Tag = "AutoFont";
+            // 
+            // Dash
+            // 
+            this.Dash.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.Dash.AutoSize = true;
+            this.Dash.BackColor = System.Drawing.Color.Transparent;
+            this.Dash.BorderColor = System.Drawing.Color.Red;
+            this.Dash.BorderSize = 0;
+            this.Dash.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
+            this.Dash.ForeColor = System.Drawing.Color.Red;
+            this.Dash.Location = new System.Drawing.Point(498, 491);
+            this.Dash.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Dash.Name = "Dash";
+            this.Dash.Size = new System.Drawing.Size(82, 87);
+            this.Dash.TabIndex = 27;
+            this.Dash.Tag = "AutoFont";
+            this.Dash.Text = "/";
+            // 
+            // wccode
+            // 
+            this.wccode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.wccode.AutoSize = true;
+            this.wccode.BackColor = System.Drawing.Color.Transparent;
+            this.wccode.BorderColor = System.Drawing.Color.Red;
+            this.wccode.Font = new System.Drawing.Font("宋体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.wccode.ForeColor = System.Drawing.Color.Red;
+            this.wccode.Location = new System.Drawing.Point(63, 222);
+            this.wccode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.wccode.Name = "wccode";
+            this.wccode.Size = new System.Drawing.Size(0, 50);
+            this.wccode.TabIndex = 28;
+            this.wccode.Visible = false;
+            // 
             // Process
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(1292, 859);
+            this.Controls.Add(this.wccode);
+            this.Controls.Add(this.Dash);
+            this.Controls.Add(this.产出);
             this.Controls.Add(this.Title2);
             this.Controls.Add(this.班次);
             this.Controls.Add(this.Line);
@@ -455,7 +512,7 @@
             this.Controls.Add(this.故障数);
             this.Controls.Add(this.直通率);
             this.Controls.Add(this.投入);
-            this.Controls.Add(this.产出);
+            this.Controls.Add(this.一次通过);
             this.Controls.Add(this.机型);
             this.Controls.Add(this.Logo);
             this.Controls.Add(this.WorkShift_label);
@@ -486,7 +543,7 @@
             this.SizeChanged += new System.EventHandler(this.Process_SizeChanged);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Process_KeyDown);
             ((System.ComponentModel.ISupportInitialize)(this.Logo)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }
@@ -510,14 +567,17 @@
         private CCWin.SkinControl.SkinLabel WorkShift_label;
         private CCWin.SkinControl.SkinPictureBox Logo;
         private CCWin.SkinControl.SkinLabel 投入;
-        private CCWin.SkinControl.SkinLabel 产出;
+        private CCWin.SkinControl.SkinLabel 一次通过;
         private CCWin.SkinControl.SkinLabel 收益率;
         private CCWin.SkinControl.SkinLabel 故障数;
         private CCWin.SkinControl.SkinLabel 直通率;
         private CCWin.SkinControl.SkinLabel 班次;
         private CCWin.SkinControl.SkinLabel Line;
         private CCWin.SkinControl.SkinLabel Title2;
-        private System.Windows.Forms.Timer Refresh;
+        private System.Windows.Forms.Timer RefreshData;
         private CustomControl.ValueLabel 机型;
+        private CCWin.SkinControl.SkinLabel 产出;
+        private CCWin.SkinControl.SkinLabel Dash;
+        private CCWin.SkinControl.SkinLabel wccode;
     }
 }

UAS_KanBan/Process.cs

@@ -1,11 +1,6 @@
-using CCWin;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using System;
 using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using UAS_KanBan.CustomControl;
 
@@ -22,7 +17,7 @@ namespace UAS_KanBan
         {
             InitializeComponent();
             Line.Text = LineCode;
-            班次.Text = WcCode;
+            wccode.Text = WcCode;
             int WorkHeight = Screen.PrimaryScreen.Bounds.Width;
             if (WorkHeight <= 1024)
             {
@@ -31,7 +26,7 @@ namespace UAS_KanBan
                     if (Controls[i] is Label || Controls[i] is ValueLabel)
                     {
                         if (Controls[i].Tag != null && Controls[i].Tag.ToString() == "AutoFont")
-                            Controls[i].Font = new Font("宋体", Controls[i].Font.Size - 10, FontStyle.Bold);
+                            Controls[i].Font = new Font("宋体", Controls[i].Font.Size - 15, FontStyle.Bold);
                         else
                             Controls[i].Font = new Font("宋体", Controls[i].Font.Size - 8, FontStyle.Bold);
                     }
@@ -43,44 +38,44 @@ namespace UAS_KanBan
         {
             asc.controllInitializeSize(this);
             Refresh_Tick(sender, e);
-            Refresh.Tick += Refresh_Tick;
-            Refresh.Interval = Setting.RefreshRate * 1000;
-            Refresh.Start();
+            RefreshData.Tick += Refresh_Tick;
+            RefreshData.Interval = Setting.RefreshRate * 1000;
+            RefreshData.Start();
             WindowState = FormWindowState.Maximized;
         }
 
         private void Refresh_Tick(object sender, EventArgs e)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select KBI_LINE_ZTL('" + Line.Text + "','" + 班次.Text + "') from dual", "select");
-            string Data = dt.Rows[0][0].ToString();
-            string[] Item = Data.Split(':');
-            string[] ItemName = new string[Item.Length];
-            string[] ItemData = new string[Item.Length];
             try
             {
+                DataTable dt = (DataTable)dh.ExecuteSql("select KBI_LINE_ZTL('" + Line.Text + "','" + wccode.Text + "') from dual", "select");
+                string Data = dt.Rows[0][0].ToString();
+                string[] Item = Data.Split(':');
+                string[] ItemName = new string[Item.Length];
+                string[] ItemData = new string[Item.Length];
                 for (int i = 0; i < Item.Length; i++)
                 {
                     ItemName[i] = Item[i].Split('|')[0];
                     ItemData[i] = Item[i].Split('|')[1];
                 }
-            }
-            catch (Exception) { }
-            for (int i = 0; i < Item.Length; i++)
-            {
-                for (int j = 0; j < Controls.Count; j++)
+                for (int i = 0; i < Item.Length; i++)
                 {
-                    if (Controls[j].Name == ItemName[i])
+                    for (int j = 0; j < Controls.Count; j++)
                     {
-                        Controls[j].Text = ItemData[i];
+                        if (Controls[j].Name == ItemName[i])
+                        {
+                            Controls[j].Text = ItemData[i];
+                        }
                     }
                 }
             }
+            catch (Exception) { }
         }
 
         private void Process_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
-            Line1.Size = new Size(2,BottomLine.Location.Y-TopLine.Location.Y);
+            Line1.Size = new Size(2, BottomLine.Location.Y - TopLine.Location.Y);
             Line2.Size = new Size(2, BottomLine.Location.Y - TopLine.Location.Y);
             Line3.Size = new Size(2, BottomLine.Location.Y - TopLine.Location.Y);
             Title.Location = new Point(Line1.Location.X + (Line2.Location.X - Line1.Location.X - Title.Size.Width) / 2, TopLine.Location.Y + (BottomLine.Location.Y - TopLine.Location.Y - Title.Size.Height) / 2);
@@ -90,18 +85,20 @@ namespace UAS_KanBan
             Line.Location = new Point(Line.Location.X, TopLine.Location.Y + (MidLine.Location.Y - TopLine.Location.Y - LineCode_label.Size.Height) / 2);
             班次.Location = new Point(班次.Location.X, MidLine.Location.Y + (BottomLine.Location.Y - MidLine.Location.Y - WorkShift_label.Size.Height) / 2);
             Logo.Size = new Size(Line1.Location.X - 20, BottomLine.Location.Y - TopLine.Location.Y - 20);
-            机型.Location = new Point(机型_label.Location.X + 机型_label.Width + 5, 机型_label.Location.Y);
-            投入.Location = new Point(投入_label.Location.X + 机型_label.Width + 5, 投入_label.Location.Y);
-            产出.Location = new Point(产出_label.Location.X + 机型_label.Width + 5, 产出_label.Location.Y);
+            机型.Location = new Point(机型_label.Location.X + 机型_label.Width + 15, 机型_label.Location.Y);
+            投入.Location = new Point(投入_label.Location.X + 机型_label.Width + 15, 投入_label.Location.Y);
+            Dash.Location = new Point(投入.Location.X + 投入.Size.Width, 投入_label.Location.Y);
+            产出.Location = new Point(Dash.Location.X + Dash.Size.Width, 投入_label.Location.Y);
+            一次通过.Location = new Point(产出_label.Location.X + 机型_label.Width + 15, 产出_label.Location.Y);
             直通率.Location = new Point(直通率_label.Location.X + 直通率_label.Width + 5, 直通率_label.Location.Y);
             收益率.Location = new Point(收益率_label.Location.X + 收益率_label.Width + 5, 收益率_label.Location.Y);
             故障数.Location = new Point(故障数_label.Location.X + 故障数_label.Width + 5, 故障数_label.Location.Y);
-            机型.MaximumSize = new Size(直通率_label.Location.X - 机型_label.Location.X - 机型_label.Width-15, 0);
+            机型.MaximumSize = new Size(直通率_label.Location.X - 机型_label.Location.X - 机型_label.Width - 15, 0);
         }
 
         private void Process_FormClosing(object sender, FormClosingEventArgs e)
         {
-            Refresh.Stop();
+            RefreshData.Stop();
         }
 
         private void Process_KeyDown(object sender, KeyEventArgs e)
@@ -111,5 +108,12 @@ namespace UAS_KanBan
                 Close();
             }
         }
+
+        private void 投入_SizeChanged(object sender, EventArgs e)
+        {
+            投入.Location = new Point(投入_label.Location.X + 机型_label.Width + 15, 投入_label.Location.Y);
+            Dash.Location = new Point(投入.Location.X + 投入.Size.Width, 投入_label.Location.Y);
+            产出.Location = new Point(Dash.Location.X + Dash.Size.Width, 投入_label.Location.Y);
+        }
     }
 }

UAS_KanBan/Process.resx

@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="Refresh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="RefreshData.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

UAS_KanBan/Setting.cs

@@ -43,6 +43,11 @@ namespace UAS_KanBan
             try
             {
                 RefreshRate = int.Parse(TimeSpan.Text);
+                if (RefreshRate < 5)
+                {
+                    MessageBox.Show("刷新时间不能小于5秒");
+                    return;
+                }
             }
             catch (Exception)
             {