UI调整

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

@@ -43,24 +43,24 @@
             this.label8 = new System.Windows.Forms.Label();
             this.label9 = new System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
-            this.panel1 = new System.Windows.Forms.Panel();
             this.inputValue = new System.Windows.Forms.Label();
             this.pr_code = new System.Windows.Forms.Label();
             this.ms_makecode = new System.Windows.Forms.Label();
             this.pr_detail = new System.Windows.Forms.Label();
+            this.SN = new System.Windows.Forms.RadioButton();
             this.rePrintCheck = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.printNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.inputText = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
-            this.panel1.SuspendLayout();
             this.SuspendLayout();
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(3, 10);
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label1.Location = new System.Drawing.Point(38, 16);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(110, 31);
             this.label1.TabIndex = 0;
@@ -70,7 +70,8 @@
             // 
             this.giftBox.AutoSize = true;
             this.giftBox.Checked = true;
-            this.giftBox.Location = new System.Drawing.Point(200, 6);
+            this.giftBox.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.giftBox.Location = new System.Drawing.Point(235, 16);
             this.giftBox.Name = "giftBox";
             this.giftBox.Size = new System.Drawing.Size(135, 35);
             this.giftBox.TabIndex = 1;
@@ -82,7 +83,8 @@
             // CartonBox
             // 
             this.CartonBox.AutoSize = true;
-            this.CartonBox.Location = new System.Drawing.Point(457, 8);
+            this.CartonBox.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.CartonBox.Location = new System.Drawing.Point(492, 14);
             this.CartonBox.Name = "CartonBox";
             this.CartonBox.Size = new System.Drawing.Size(164, 35);
             this.CartonBox.TabIndex = 2;
@@ -93,7 +95,8 @@
             // fuselagel
             // 
             this.fuselagel.AutoSize = true;
-            this.fuselagel.Location = new System.Drawing.Point(739, 8);
+            this.fuselagel.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.fuselagel.Location = new System.Drawing.Point(732, 12);
             this.fuselagel.Name = "fuselagel";
             this.fuselagel.Size = new System.Drawing.Size(159, 35);
             this.fuselagel.TabIndex = 3;
@@ -105,7 +108,7 @@
             // 
             this.label.AutoSize = true;
             this.label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label.Location = new System.Drawing.Point(37, 61);
+            this.label.Location = new System.Drawing.Point(38, 52);
             this.label.Name = "label";
             this.label.Size = new System.Drawing.Size(86, 31);
             this.label.TabIndex = 4;
@@ -115,7 +118,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label3.Location = new System.Drawing.Point(545, 61);
+            this.label3.Location = new System.Drawing.Point(546, 52);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(110, 31);
             this.label3.TabIndex = 5;
@@ -125,7 +128,7 @@
             // 
             this.label111.AutoSize = true;
             this.label111.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label111.Location = new System.Drawing.Point(37, 102);
+            this.label111.Location = new System.Drawing.Point(38, 93);
             this.label111.Name = "label111";
             this.label111.Size = new System.Drawing.Size(110, 31);
             this.label111.TabIndex = 6;
@@ -135,7 +138,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label5.Location = new System.Drawing.Point(545, 102);
+            this.label5.Location = new System.Drawing.Point(546, 93);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(62, 31);
             this.label5.TabIndex = 7;
@@ -145,7 +148,7 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(187, 196);
+            this.PrintLabel.Location = new System.Drawing.Point(188, 187);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
             this.PrintLabel.Size = new System.Drawing.Size(222, 26);
@@ -155,7 +158,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(37, 144);
+            this.label6.Location = new System.Drawing.Point(38, 135);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(134, 31);
@@ -166,7 +169,7 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(37, 191);
+            this.label7.Location = new System.Drawing.Point(38, 182);
             this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(110, 31);
@@ -177,7 +180,7 @@
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label8.Location = new System.Drawing.Point(37, 242);
+            this.label8.Location = new System.Drawing.Point(38, 233);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(86, 31);
             this.label8.TabIndex = 190;
@@ -187,7 +190,7 @@
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label9.Location = new System.Drawing.Point(37, 293);
+            this.label9.Location = new System.Drawing.Point(38, 284);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(62, 31);
             this.label9.TabIndex = 192;
@@ -197,30 +200,17 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label10.Location = new System.Drawing.Point(46, 600);
+            this.label10.Location = new System.Drawing.Point(49, 587);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(110, 31);
             this.label10.TabIndex = 196;
             this.label10.Text = "补打核对";
             // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight;
-            this.panel1.Controls.Add(this.giftBox);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.CartonBox);
-            this.panel1.Controls.Add(this.fuselagel);
-            this.panel1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.panel1.Location = new System.Drawing.Point(43, 12);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1057, 46);
-            this.panel1.TabIndex = 198;
-            // 
             // inputValue
             // 
             this.inputValue.AutoSize = true;
             this.inputValue.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.inputValue.Location = new System.Drawing.Point(181, 61);
+            this.inputValue.Location = new System.Drawing.Point(182, 52);
             this.inputValue.Name = "inputValue";
             this.inputValue.Size = new System.Drawing.Size(0, 31);
             this.inputValue.TabIndex = 199;
@@ -229,7 +219,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_code.Location = new System.Drawing.Point(181, 102);
+            this.pr_code.Location = new System.Drawing.Point(182, 93);
             this.pr_code.Name = "pr_code";
             this.pr_code.Size = new System.Drawing.Size(0, 31);
             this.pr_code.TabIndex = 200;
@@ -239,7 +229,7 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_makecode.Location = new System.Drawing.Point(655, 61);
+            this.ms_makecode.Location = new System.Drawing.Point(656, 52);
             this.ms_makecode.Name = "ms_makecode";
             this.ms_makecode.Size = new System.Drawing.Size(0, 31);
             this.ms_makecode.TabIndex = 201;
@@ -248,17 +238,30 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail.Location = new System.Drawing.Point(655, 102);
+            this.pr_detail.Location = new System.Drawing.Point(656, 93);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 31);
             this.pr_detail.TabIndex = 202;
             // 
+            // SN
+            // 
+            this.SN.AutoSize = true;
+            this.SN.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.SN.Location = new System.Drawing.Point(955, 10);
+            this.SN.Name = "SN";
+            this.SN.Size = new System.Drawing.Size(145, 35);
+            this.SN.TabIndex = 203;
+            this.SN.TabStop = true;
+            this.SN.Text = "SN标打印";
+            this.SN.UseVisualStyleBackColor = true;
+            this.SN.CheckedChanged += new System.EventHandler(this.SN_CheckedChanged);
+            // 
             // rePrintCheck
             // 
             this.rePrintCheck.AllPower = null;
             this.rePrintCheck.BackColor = System.Drawing.Color.White;
             this.rePrintCheck.ID = null;
-            this.rePrintCheck.Location = new System.Drawing.Point(221, 600);
+            this.rePrintCheck.Location = new System.Drawing.Point(224, 587);
             this.rePrintCheck.Name = "rePrintCheck";
             this.rePrintCheck.Power = null;
             this.rePrintCheck.Size = new System.Drawing.Size(242, 28);
@@ -271,7 +274,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(43, 332);
+            this.OperateResult.Location = new System.Drawing.Point(44, 323);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(1144, 246);
@@ -285,7 +288,7 @@
             this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
             this.normalButton1.Image = null;
             this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(549, 296);
+            this.normalButton1.Location = new System.Drawing.Point(550, 287);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
@@ -301,7 +304,7 @@
             this.printNum.AllPower = null;
             this.printNum.BackColor = System.Drawing.Color.White;
             this.printNum.ID = null;
-            this.printNum.Location = new System.Drawing.Point(187, 296);
+            this.printNum.Location = new System.Drawing.Point(188, 287);
             this.printNum.Name = "printNum";
             this.printNum.Negative = false;
             this.printNum.Power = null;
@@ -317,7 +320,7 @@
             this.inputText.AllPower = null;
             this.inputText.BackColor = System.Drawing.Color.White;
             this.inputText.ID = null;
-            this.inputText.Location = new System.Drawing.Point(187, 242);
+            this.inputText.Location = new System.Drawing.Point(188, 233);
             this.inputText.Name = "inputText";
             this.inputText.Power = null;
             this.inputText.Size = new System.Drawing.Size(222, 28);
@@ -329,7 +332,7 @@
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(187, 144);
+            this.Printer.Location = new System.Drawing.Point(188, 135);
             this.Printer.Margin = new System.Windows.Forms.Padding(6);
             this.Printer.Name = "Printer";
             this.Printer.Size = new System.Drawing.Size(222, 37);
@@ -339,12 +342,16 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1227, 653);
+            this.ClientSize = new System.Drawing.Size(1227, 644);
+            this.Controls.Add(this.SN);
+            this.Controls.Add(this.giftBox);
             this.Controls.Add(this.pr_detail);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.CartonBox);
             this.Controls.Add(this.ms_makecode);
+            this.Controls.Add(this.fuselagel);
             this.Controls.Add(this.pr_code);
             this.Controls.Add(this.inputValue);
-            this.Controls.Add(this.panel1);
             this.Controls.Add(this.rePrintCheck);
             this.Controls.Add(this.label10);
             this.Controls.Add(this.OperateResult);
@@ -368,8 +375,6 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_RePrintLabel_FormClosing);
             this.Load += new System.EventHandler(this.Make_RePrintLabel_Load);
             this.SizeChanged += new System.EventHandler(this.Make_RePrintLabel_SizeChanged);
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -397,10 +402,10 @@
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private System.Windows.Forms.Label label10;
         private CustomControl.TextBoxWithIcon.EnterTextBox rePrintCheck;
-        private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Label inputValue;
         private System.Windows.Forms.Label pr_code;
         private System.Windows.Forms.Label ms_makecode;
         private System.Windows.Forms.Label pr_detail;
+        private System.Windows.Forms.RadioButton SN;
     }
 }

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -114,6 +114,14 @@ namespace UAS_MES.Make
                 clearAll();
             }
         }
+        private void SN_CheckedChanged(object sender, EventArgs e)
+        {
+            if (SN.Checked)
+            {
+                OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                clearAll();
+            }
+        }
         private void inputText_KeyDown(object sender, KeyEventArgs e)
         {
             //按下enter键
@@ -407,7 +415,5 @@ namespace UAS_MES.Make
             pr_detail.Text = "";
             TSN = "";
         }
-
-       
     }
 }