界面调整

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

@@ -43,10 +43,10 @@
             this.pr_cartongw_label = new System.Windows.Forms.Label();
             this.pr_code_label = new System.Windows.Forms.Label();
             this.panel4 = new System.Windows.Forms.Panel();
-            this.RefreshWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.pr_cartonunit = new System.Windows.Forms.Label();
-            this.label22 = new System.Windows.Forms.Label();
+            this.weight_label = new System.Windows.Forms.Label();
             this.weight = new System.Windows.Forms.Label();
+            this.RefreshWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.label15 = new System.Windows.Forms.Label();
             this.pr_detail_label = new System.Windows.Forms.Label();
             this.ma_qty_label = new System.Windows.Forms.Label();
@@ -139,7 +139,7 @@
             this.SendCheck.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.SendCheck.Image = null;
             this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(431, 110);
+            this.SendCheck.Location = new System.Drawing.Point(414, 110);
             this.SendCheck.Margin = new System.Windows.Forms.Padding(4);
             this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
             this.SendCheck.Name = "SendCheck";
@@ -246,9 +246,8 @@
             // panel4
             // 
             this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel4.Controls.Add(this.RefreshWeigh);
             this.panel4.Controls.Add(this.pr_cartonunit);
-            this.panel4.Controls.Add(this.label22);
+            this.panel4.Controls.Add(this.weight_label);
             this.panel4.Controls.Add(this.weight);
             this.panel4.Location = new System.Drawing.Point(33, 95);
             this.panel4.Margin = new System.Windows.Forms.Padding(4);
@@ -256,25 +255,6 @@
             this.panel4.Size = new System.Drawing.Size(495, 156);
             this.panel4.TabIndex = 91;
             // 
-            // RefreshWeigh
-            // 
-            this.RefreshWeigh.AllPower = null;
-            this.RefreshWeigh.BackColor = System.Drawing.Color.Transparent;
-            this.RefreshWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.DownImage")));
-            this.RefreshWeigh.Image = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.Image")));
-            this.RefreshWeigh.IsShowBorder = true;
-            this.RefreshWeigh.Location = new System.Drawing.Point(389, 68);
-            this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(4);
-            this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
-            this.RefreshWeigh.Name = "RefreshWeigh";
-            this.RefreshWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.NormalImage")));
-            this.RefreshWeigh.Power = null;
-            this.RefreshWeigh.Size = new System.Drawing.Size(80, 30);
-            this.RefreshWeigh.TabIndex = 186;
-            this.RefreshWeigh.Text = "刷新重量";
-            this.RefreshWeigh.UseVisualStyleBackColor = true;
-            this.RefreshWeigh.Click += new System.EventHandler(this.RefreshWeigh_Click);
-            // 
             // pr_cartonunit
             // 
             this.pr_cartonunit.AutoSize = true;
@@ -289,18 +269,18 @@
             this.pr_cartonunit.Text = "克";
             this.pr_cartonunit.Visible = false;
             // 
-            // label22
+            // weight_label
             // 
-            this.label22.AutoSize = true;
-            this.label22.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label22.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label22.Location = new System.Drawing.Point(20, 64);
-            this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(62, 31);
-            this.label22.TabIndex = 20;
-            this.label22.Text = "重量";
+            this.weight_label.AutoSize = true;
+            this.weight_label.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.weight_label.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.weight_label.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+            this.weight_label.Location = new System.Drawing.Point(20, 64);
+            this.weight_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.weight_label.Name = "weight_label";
+            this.weight_label.Size = new System.Drawing.Size(62, 31);
+            this.weight_label.TabIndex = 20;
+            this.weight_label.Text = "重量";
             // 
             // weight
             // 
@@ -316,6 +296,25 @@
             this.weight.Size = new System.Drawing.Size(0, 78);
             this.weight.TabIndex = 41;
             // 
+            // RefreshWeigh
+            // 
+            this.RefreshWeigh.AllPower = null;
+            this.RefreshWeigh.BackColor = System.Drawing.Color.Transparent;
+            this.RefreshWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.DownImage")));
+            this.RefreshWeigh.Image = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.Image")));
+            this.RefreshWeigh.IsShowBorder = true;
+            this.RefreshWeigh.Location = new System.Drawing.Point(446, 281);
+            this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(4);
+            this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
+            this.RefreshWeigh.Name = "RefreshWeigh";
+            this.RefreshWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.NormalImage")));
+            this.RefreshWeigh.Power = null;
+            this.RefreshWeigh.Size = new System.Drawing.Size(80, 30);
+            this.RefreshWeigh.TabIndex = 186;
+            this.RefreshWeigh.Text = "刷新重量";
+            this.RefreshWeigh.UseVisualStyleBackColor = true;
+            this.RefreshWeigh.Click += new System.EventHandler(this.RefreshWeigh_Click);
+            // 
             // label15
             // 
             this.label15.AutoSize = true;
@@ -375,7 +374,7 @@
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Printer_label.Location = new System.Drawing.Point(1119, 139);
+            this.Printer_label.Location = new System.Drawing.Point(1113, 139);
             this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Printer_label.Name = "Printer_label";
             this.Printer_label.Size = new System.Drawing.Size(107, 25);
@@ -386,7 +385,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(1119, 181);
+            this.label1.Location = new System.Drawing.Point(1113, 181);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(88, 25);
@@ -397,7 +396,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(1119, 96);
+            this.label2.Location = new System.Drawing.Point(1113, 96);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(88, 25);
@@ -600,7 +599,7 @@
             // 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(1124, 268);
+            this.OperateResult.Location = new System.Drawing.Point(1113, 268);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(297, 376);
@@ -646,7 +645,7 @@
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(1124, 49);
+            this.AutoPrint.Location = new System.Drawing.Point(1118, 49);
             this.AutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AutoPrint.Name = "AutoPrint";
             this.AutoPrint.Size = new System.Drawing.Size(117, 35);
@@ -672,7 +671,8 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1429, 700);
+            this.ClientSize = new System.Drawing.Size(1292, 700);
+            this.Controls.Add(this.RefreshWeigh);
             this.Controls.Add(this.PrintNum);
             this.Controls.Add(this.AutoPrint);
             this.Controls.Add(this.WeighRecord);
@@ -740,7 +740,7 @@
         private System.Windows.Forms.Label pr_code_label;
         private System.Windows.Forms.Panel panel4;
         private System.Windows.Forms.Label pr_cartonunit;
-        private System.Windows.Forms.Label label22;
+        private System.Windows.Forms.Label weight_label;
         private System.Windows.Forms.Label weight;
         private System.Windows.Forms.Label label15;
         private System.Windows.Forms.Label pr_detail_label;

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -93,6 +93,7 @@ namespace UAS_MES.Make
 
         private void 卡通箱称重_SizeChanged(object sender, EventArgs e)
         {
+            weight.Location = new Point(weight_label.Location.X + weight_label.Size.Width-10, weight_label.Location.Y-20);
             asc.controlAutoSize(this);
         }
 

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

@@ -32,7 +32,7 @@
             this.pr_colorboxgw_label = new System.Windows.Forms.Label();
             this.pr_code_label = new System.Windows.Forms.Label();
             this.pr_colorboxunit = new System.Windows.Forms.Label();
-            this.label22 = new System.Windows.Forms.Label();
+            this.weight_label = new System.Windows.Forms.Label();
             this.weight = new System.Windows.Forms.Label();
             this.panel4 = new System.Windows.Forms.Panel();
             this.RefreshWeigh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -116,18 +116,18 @@
             this.pr_colorboxunit.Text = "克";
             this.pr_colorboxunit.Visible = false;
             // 
-            // label22
+            // weight_label
             // 
-            this.label22.AutoSize = true;
-            this.label22.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label22.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label22.Location = new System.Drawing.Point(21, 65);
-            this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(62, 31);
-            this.label22.TabIndex = 20;
-            this.label22.Text = "重量";
+            this.weight_label.AutoSize = true;
+            this.weight_label.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.weight_label.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.weight_label.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+            this.weight_label.Location = new System.Drawing.Point(21, 65);
+            this.weight_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.weight_label.Name = "weight_label";
+            this.weight_label.Size = new System.Drawing.Size(62, 31);
+            this.weight_label.TabIndex = 20;
+            this.weight_label.Text = "重量";
             // 
             // weight
             // 
@@ -143,9 +143,8 @@
             // panel4
             // 
             this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel4.Controls.Add(this.RefreshWeigh);
             this.panel4.Controls.Add(this.pr_colorboxunit);
-            this.panel4.Controls.Add(this.label22);
+            this.panel4.Controls.Add(this.weight_label);
             this.panel4.Controls.Add(this.weight);
             this.panel4.Location = new System.Drawing.Point(21, 98);
             this.panel4.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
@@ -160,7 +159,7 @@
             this.RefreshWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.DownImage")));
             this.RefreshWeigh.Image = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.Image")));
             this.RefreshWeigh.IsShowBorder = true;
-            this.RefreshWeigh.Location = new System.Drawing.Point(357, 65);
+            this.RefreshWeigh.Location = new System.Drawing.Point(407, 296);
             this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
             this.RefreshWeigh.Name = "RefreshWeigh";
@@ -356,7 +355,7 @@
             // 
             this.ob_checkno_label.AutoSize = true;
             this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_checkno_label.Location = new System.Drawing.Point(31, 99);
+            this.ob_checkno_label.Location = new System.Drawing.Point(31, 96);
             this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno_label.Name = "ob_checkno_label";
             this.ob_checkno_label.Size = new System.Drawing.Size(115, 32);
@@ -367,7 +366,7 @@
             // 
             this.ob_checkno.AutoSize = true;
             this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_checkno.Location = new System.Drawing.Point(162, 99);
+            this.ob_checkno.Location = new System.Drawing.Point(162, 96);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Size = new System.Drawing.Size(0, 32);
@@ -379,7 +378,7 @@
             // 
             this.ob_nowcheckqty.AutoSize = true;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(384, 40);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(384, 37);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 32);
@@ -389,7 +388,7 @@
             // 
             this.ob_batchqty.AutoSize = true;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_batchqty.Location = new System.Drawing.Point(162, 40);
+            this.ob_batchqty.Location = new System.Drawing.Point(162, 37);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Size = new System.Drawing.Size(0, 32);
@@ -399,7 +398,7 @@
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(256, 40);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(256, 37);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
             this.ob_nowcheckqty_label.Size = new System.Drawing.Size(115, 32);
@@ -410,7 +409,7 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.ob_batchqty_label.Location = new System.Drawing.Point(31, 40);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(31, 37);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
             this.ob_batchqty_label.Size = new System.Drawing.Size(115, 32);
@@ -426,7 +425,7 @@
             this.SendCheck.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.SendCheck.Image = null;
             this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(396, 108);
+            this.SendCheck.Location = new System.Drawing.Point(387, 108);
             this.SendCheck.Margin = new System.Windows.Forms.Padding(4);
             this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
             this.SendCheck.Name = "SendCheck";
@@ -509,7 +508,7 @@
             this.StartWeight.DownImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.DownImage")));
             this.StartWeight.Image = ((System.Drawing.Image)(resources.GetObject("StartWeight.Image")));
             this.StartWeight.IsShowBorder = true;
-            this.StartWeight.Location = new System.Drawing.Point(828, 30);
+            this.StartWeight.Location = new System.Drawing.Point(802, 30);
             this.StartWeight.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.StartWeight.MoveImage = ((System.Drawing.Image)(resources.GetObject("StartWeight.MoveImage")));
             this.StartWeight.Name = "StartWeight";
@@ -636,7 +635,7 @@
             this.sncode.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.sncode.Name = "sncode";
             this.sncode.Power = "";
-            this.sncode.Size = new System.Drawing.Size(671, 47);
+            this.sncode.Size = new System.Drawing.Size(624, 47);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -673,7 +672,8 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1356, 730);
+            this.ClientSize = new System.Drawing.Size(1292, 730);
+            this.Controls.Add(this.RefreshWeigh);
             this.Controls.Add(this.PrintNum);
             this.Controls.Add(this.groupBoxWithBorder2);
             this.Controls.Add(this.pr_colorboxgw);
@@ -730,7 +730,7 @@
         private System.Windows.Forms.Label pr_colorboxgw_label;
         private System.Windows.Forms.Label pr_code_label;
         private System.Windows.Forms.Label pr_colorboxunit;
-        private System.Windows.Forms.Label label22;
+        private System.Windows.Forms.Label weight_label;
         private System.Windows.Forms.Label weight;
         private System.Windows.Forms.Panel panel4;
         private System.Windows.Forms.Label label15;

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -208,6 +208,7 @@ namespace UAS_MES.Make
 
         private void 彩盒称重_SizeChanged(object sender, EventArgs e)
         {
+            weight.Location = new Point(weight_label.Location.X + weight_label.Size.Width - 10, weight_label.Location.Y - 20);
             asc.controlAutoSize(this);
         }