修改指令可以配置

UAS_MES_JH/FunctionCode/Make/Make_ColorBoxLabelPrint.Designer.cs

@@ -69,6 +69,7 @@
             this.label9 = new System.Windows.Forms.Label();
             this.button1 = new System.Windows.Forms.Button();
             this.autoprint = new System.Windows.Forms.CheckBox();
+            this.pr_serial = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             ((System.ComponentModel.ISupportInitialize)(this.XmlWatcher)).BeginInit();
             this.SuspendLayout();
             // 
@@ -76,10 +77,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(1034, 165);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(1379, 220);
+            this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(86, 31);
+            this.label2.Size = new System.Drawing.Size(114, 41);
             this.label2.TabIndex = 180;
             this.label2.Text = "打印机";
             // 
@@ -87,10 +88,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(16, 159);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(21, 212);
+            this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(62, 31);
+            this.label1.Size = new System.Drawing.Size(82, 41);
             this.label1.TabIndex = 179;
             this.label1.Text = "标签";
             // 
@@ -98,23 +99,23 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(969, 48);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(1292, 64);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(110, 31);
+            this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
             this.pr_detail_label.TabIndex = 171;
             this.pr_detail_label.Text = "产品名称";
             // 
             // sncode_label
             // 
-            this.sncode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.sncode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(78, 675);
-            this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sncode_label.Location = new System.Drawing.Point(104, 900);
+            this.sncode_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(48, 31);
+            this.sncode_label.Size = new System.Drawing.Size(62, 41);
             this.sncode_label.TabIndex = 170;
             this.sncode_label.Text = "SN";
             // 
@@ -122,10 +123,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(969, 119);
-            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Location = new System.Drawing.Point(1292, 159);
+            this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(110, 31);
+            this.label4.Size = new System.Drawing.Size(146, 41);
             this.label4.TabIndex = 167;
             this.label4.Text = "打印张数";
             // 
@@ -133,10 +134,10 @@
             // 
             this.mcd_okqty_label.AutoSize = true;
             this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty_label.Location = new System.Drawing.Point(18, 111);
-            this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(24, 148);
+            this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.mcd_okqty_label.Name = "mcd_okqty_label";
-            this.mcd_okqty_label.Size = new System.Drawing.Size(110, 31);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(146, 41);
             this.mcd_okqty_label.TabIndex = 165;
             this.mcd_okqty_label.Text = "打印计数";
             // 
@@ -144,10 +145,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(562, 48);
-            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_code_label.Location = new System.Drawing.Point(749, 64);
+            this.pr_code_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(110, 31);
+            this.pr_code_label.Size = new System.Drawing.Size(146, 41);
             this.pr_code_label.TabIndex = 164;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -155,10 +156,10 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(15, 48);
-            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode_label.Location = new System.Drawing.Point(20, 64);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(110, 31);
+            this.ms_makecode_label.Size = new System.Drawing.Size(146, 41);
             this.ms_makecode_label.TabIndex = 163;
             this.ms_makecode_label.Text = "归属工单";
             // 
@@ -166,10 +167,10 @@
             // 
             this.CheckTSN.AutoSize = true;
             this.CheckTSN.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CheckTSN.Location = new System.Drawing.Point(1074, 674);
-            this.CheckTSN.Margin = new System.Windows.Forms.Padding(4);
+            this.CheckTSN.Location = new System.Drawing.Point(1432, 899);
+            this.CheckTSN.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.CheckTSN.Name = "CheckTSN";
-            this.CheckTSN.Size = new System.Drawing.Size(184, 35);
+            this.CheckTSN.Size = new System.Drawing.Size(240, 45);
             this.CheckTSN.TabIndex = 186;
             this.CheckTSN.Text = "是否检查TSN";
             this.CheckTSN.UseVisualStyleBackColor = true;
@@ -180,10 +181,10 @@
             // 
             this.CollectRemark.AutoSize = true;
             this.CollectRemark.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.CollectRemark.Location = new System.Drawing.Point(1099, 673);
-            this.CollectRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.CollectRemark.Location = new System.Drawing.Point(1465, 897);
+            this.CollectRemark.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.CollectRemark.Name = "CollectRemark";
-            this.CollectRemark.Size = new System.Drawing.Size(118, 31);
+            this.CollectRemark.Size = new System.Drawing.Size(155, 39);
             this.CollectRemark.TabIndex = 197;
             this.CollectRemark.Text = "采集备注";
             this.CollectRemark.UseVisualStyleBackColor = true;
@@ -199,9 +200,10 @@
             // ChooseFolder
             // 
             this.ChooseFolder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ChooseFolder.Location = new System.Drawing.Point(1274, 391);
+            this.ChooseFolder.Location = new System.Drawing.Point(1699, 521);
+            this.ChooseFolder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChooseFolder.Name = "ChooseFolder";
-            this.ChooseFolder.Size = new System.Drawing.Size(117, 36);
+            this.ChooseFolder.Size = new System.Drawing.Size(156, 48);
             this.ChooseFolder.TabIndex = 200;
             this.ChooseFolder.Text = "选择文件夹";
             this.ChooseFolder.UseVisualStyleBackColor = true;
@@ -210,27 +212,30 @@
             // FolderPath
             // 
             this.FolderPath.Enabled = false;
-            this.FolderPath.Location = new System.Drawing.Point(1022, 397);
+            this.FolderPath.Location = new System.Drawing.Point(1363, 529);
+            this.FolderPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.FolderPath.Name = "FolderPath";
-            this.FolderPath.Size = new System.Drawing.Size(236, 28);
+            this.FolderPath.Size = new System.Drawing.Size(313, 35);
             this.FolderPath.TabIndex = 199;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(1121, 354);
+            this.label3.Location = new System.Drawing.Point(1495, 472);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(123, 30);
+            this.label3.Size = new System.Drawing.Size(162, 38);
             this.label3.TabIndex = 198;
             this.label3.Text = "监控文件夹";
             // 
             // StartWatch
             // 
             this.StartWatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.StartWatch.Location = new System.Drawing.Point(1064, 449);
+            this.StartWatch.Location = new System.Drawing.Point(1419, 599);
+            this.StartWatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.StartWatch.Name = "StartWatch";
-            this.StartWatch.Size = new System.Drawing.Size(96, 42);
+            this.StartWatch.Size = new System.Drawing.Size(128, 56);
             this.StartWatch.TabIndex = 201;
             this.StartWatch.Text = "开始监控";
             this.StartWatch.UseVisualStyleBackColor = true;
@@ -240,9 +245,10 @@
             // 
             this.StopWatch.Enabled = false;
             this.StopWatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.StopWatch.Location = new System.Drawing.Point(1232, 449);
+            this.StopWatch.Location = new System.Drawing.Point(1643, 599);
+            this.StopWatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.StopWatch.Name = "StopWatch";
-            this.StopWatch.Size = new System.Drawing.Size(96, 42);
+            this.StopWatch.Size = new System.Drawing.Size(128, 56);
             this.StopWatch.TabIndex = 202;
             this.StopWatch.Text = "停止监控";
             this.StopWatch.UseVisualStyleBackColor = true;
@@ -250,14 +256,14 @@
             // 
             // label5
             // 
-            this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(518, 675);
-            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Location = new System.Drawing.Point(691, 900);
+            this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(61, 31);
+            this.label5.Size = new System.Drawing.Size(80, 41);
             this.label5.TabIndex = 203;
             this.label5.Text = "SKU";
             // 
@@ -265,10 +271,10 @@
             // 
             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(562, 111);
-            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Location = new System.Drawing.Point(749, 148);
+            this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(110, 31);
+            this.label6.Size = new System.Drawing.Size(146, 41);
             this.label6.TabIndex = 206;
             this.label6.Text = "软件版本";
             // 
@@ -277,11 +283,11 @@
             this.ma_softversion.AutoSize = true;
             this.ma_softversion.CutLength = null;
             this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_softversion.Location = new System.Drawing.Point(694, 113);
-            this.ma_softversion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_softversion.MaximumSize = new System.Drawing.Size(225, 0);
+            this.ma_softversion.Location = new System.Drawing.Point(925, 151);
+            this.ma_softversion.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.ma_softversion.MaximumSize = new System.Drawing.Size(300, 0);
             this.ma_softversion.Name = "ma_softversion";
-            this.ma_softversion.Size = new System.Drawing.Size(0, 31);
+            this.ma_softversion.Size = new System.Drawing.Size(0, 41);
             this.ma_softversion.TabIndex = 207;
             // 
             // lockCheckBox1
@@ -289,10 +295,10 @@
             this.lockCheckBox1.AutoSize = true;
             this.lockCheckBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lockCheckBox1.LeaveEvent = false;
-            this.lockCheckBox1.Location = new System.Drawing.Point(908, 675);
-            this.lockCheckBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.lockCheckBox1.Location = new System.Drawing.Point(1211, 900);
+            this.lockCheckBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.lockCheckBox1.Name = "lockCheckBox1";
-            this.lockCheckBox1.Size = new System.Drawing.Size(72, 28);
+            this.lockCheckBox1.Size = new System.Drawing.Size(94, 35);
             this.lockCheckBox1.TabIndex = 205;
             this.lockCheckBox1.Text = "锁定";
             this.lockCheckBox1.UseVisualStyleBackColor = true;
@@ -304,14 +310,14 @@
             this.US_SKU.Condition = null;
             this.US_SKU.DBTitle = null;
             this.US_SKU.FormName = null;
-            this.US_SKU.Location = new System.Drawing.Point(588, 675);
-            this.US_SKU.Margin = new System.Windows.Forms.Padding(4);
+            this.US_SKU.Location = new System.Drawing.Point(784, 900);
+            this.US_SKU.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.US_SKU.Name = "US_SKU";
             this.US_SKU.Power = null;
             this.US_SKU.ReturnData = null;
             this.US_SKU.SelectField = null;
             this.US_SKU.SetValueField = null;
-            this.US_SKU.Size = new System.Drawing.Size(310, 32);
+            this.US_SKU.Size = new System.Drawing.Size(413, 43);
             this.US_SKU.TabIndex = 204;
             this.US_SKU.TableName = null;
             this.US_SKU.TextBoxEnable = true;
@@ -319,10 +325,10 @@
             // Remark
             // 
             this.Remark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Remark.Location = new System.Drawing.Point(1040, 644);
-            this.Remark.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Remark.Location = new System.Drawing.Point(1387, 859);
+            this.Remark.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.Remark.Name = "Remark";
-            this.Remark.Size = new System.Drawing.Size(304, 16);
+            this.Remark.Size = new System.Drawing.Size(404, 20);
             this.Remark.TabIndex = 196;
             this.Remark.Text = "";
             this.Remark.Visible = false;
@@ -330,9 +336,10 @@
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(975, 16);
+            this.StepCount.Location = new System.Drawing.Point(1300, 21);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(120, 33);
+            this.StepCount.Size = new System.Drawing.Size(160, 44);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 189;
@@ -342,10 +349,10 @@
             this.LockMakeCode.AutoSize = true;
             this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.LockMakeCode.LeaveEvent = false;
-            this.LockMakeCode.Location = new System.Drawing.Point(374, 48);
-            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(4);
+            this.LockMakeCode.Location = new System.Drawing.Point(499, 64);
+            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
+            this.LockMakeCode.Size = new System.Drawing.Size(94, 35);
             this.LockMakeCode.TabIndex = 185;
             this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.UseVisualStyleBackColor = true;
@@ -357,14 +364,14 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(135, 48);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
+            this.ma_code.Location = new System.Drawing.Point(180, 64);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.ReturnData = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(224, 32);
+            this.ma_code.Size = new System.Drawing.Size(299, 43);
             this.ma_code.TabIndex = 184;
             this.ma_code.TableName = null;
             this.ma_code.TextBoxEnable = true;
@@ -374,28 +381,29 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(96, 161);
+            this.PrintLabel.Location = new System.Drawing.Point(128, 215);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(642, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(855, 32);
             this.PrintLabel.TabIndex = 181;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(1126, 165);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6);
+            this.Printer.Location = new System.Drawing.Point(1501, 220);
+            this.Printer.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(201, 38);
+            this.Printer.Size = new System.Drawing.Size(268, 51);
             this.Printer.TabIndex = 178;
             // 
             // mcd_okqty
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(129, 111);
-            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_okqty.Location = new System.Drawing.Point(172, 148);
+            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(28, 31);
+            this.mcd_okqty.Size = new System.Drawing.Size(37, 41);
             this.mcd_okqty.TabIndex = 176;
             this.mcd_okqty.Text = "0";
             // 
@@ -404,11 +412,11 @@
             this.pr_code.AutoSize = true;
             this.pr_code.CutLength = null;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(694, 48);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_code.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pr_code.Location = new System.Drawing.Point(925, 64);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.pr_code.MaximumSize = new System.Drawing.Size(300, 0);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 31);
+            this.pr_code.Size = new System.Drawing.Size(0, 41);
             this.pr_code.TabIndex = 175;
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
@@ -417,11 +425,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(1101, 48);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pr_detail.Location = new System.Drawing.Point(1468, 64);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(300, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 31);
+            this.pr_detail.Size = new System.Drawing.Size(0, 41);
             this.pr_detail.TabIndex = 174;
             // 
             // PrintNum
@@ -430,12 +438,12 @@
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.Enabled = false;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(1101, 119);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
+            this.PrintNum.Location = new System.Drawing.Point(1468, 159);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(223, 28);
+            this.PrintNum.Size = new System.Drawing.Size(296, 35);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -445,15 +453,15 @@
             // sncode
             // 
             this.sncode.AllPower = "ifall";
-            this.sncode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.sncode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(178, 675);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.sncode.Location = new System.Drawing.Point(237, 900);
+            this.sncode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(292, 28);
+            this.sncode.Size = new System.Drawing.Size(388, 35);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -464,32 +472,33 @@
             // 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(21, 194);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(28, 259);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(970, 456);
+            this.OperateResult.Size = new System.Drawing.Size(1292, 607);
             this.OperateResult.TabIndex = 168;
             this.OperateResult.Text = "";
             // 
             // label7
             // 
             this.label7.Location = new System.Drawing.Point(0, 0);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(100, 23);
+            this.label7.Size = new System.Drawing.Size(133, 31);
             this.label7.TabIndex = 212;
             // 
             // US_COLORCODE
             // 
             this.US_COLORCODE.AllPower = "ifall";
-            this.US_COLORCODE.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.US_COLORCODE.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.US_COLORCODE.BackColor = System.Drawing.Color.White;
             this.US_COLORCODE.ID = null;
-            this.US_COLORCODE.Location = new System.Drawing.Point(1099, 267);
-            this.US_COLORCODE.Margin = new System.Windows.Forms.Padding(4);
+            this.US_COLORCODE.Location = new System.Drawing.Point(1465, 356);
+            this.US_COLORCODE.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.US_COLORCODE.Name = "US_COLORCODE";
             this.US_COLORCODE.Power = null;
-            this.US_COLORCODE.Size = new System.Drawing.Size(292, 28);
+            this.US_COLORCODE.Size = new System.Drawing.Size(388, 35);
             this.US_COLORCODE.Str = null;
             this.US_COLORCODE.Str1 = null;
             this.US_COLORCODE.Str2 = null;
@@ -498,29 +507,29 @@
             // 
             // label8
             // 
-            this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(999, 312);
-            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label8.Location = new System.Drawing.Point(1332, 416);
+            this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(129, 31);
+            this.label8.Size = new System.Drawing.Size(169, 41);
             this.label8.TabIndex = 211;
             this.label8.Text = "PRCOLOR";
             // 
             // US_PRODUCTCOLOR
             // 
             this.US_PRODUCTCOLOR.AllPower = "ifall";
-            this.US_PRODUCTCOLOR.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.US_PRODUCTCOLOR.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.US_PRODUCTCOLOR.BackColor = System.Drawing.Color.White;
             this.US_PRODUCTCOLOR.ID = null;
-            this.US_PRODUCTCOLOR.Location = new System.Drawing.Point(1136, 312);
-            this.US_PRODUCTCOLOR.Margin = new System.Windows.Forms.Padding(4);
+            this.US_PRODUCTCOLOR.Location = new System.Drawing.Point(1515, 416);
+            this.US_PRODUCTCOLOR.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.US_PRODUCTCOLOR.Name = "US_PRODUCTCOLOR";
             this.US_PRODUCTCOLOR.Power = null;
-            this.US_PRODUCTCOLOR.Size = new System.Drawing.Size(255, 28);
+            this.US_PRODUCTCOLOR.Size = new System.Drawing.Size(339, 35);
             this.US_PRODUCTCOLOR.Str = null;
             this.US_PRODUCTCOLOR.Str1 = null;
             this.US_PRODUCTCOLOR.Str2 = null;
@@ -529,23 +538,24 @@
             // 
             // label9
             // 
-            this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(999, 267);
-            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label9.Location = new System.Drawing.Point(1332, 356);
+            this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(86, 31);
+            this.label9.Size = new System.Drawing.Size(114, 41);
             this.label9.TabIndex = 213;
             this.label9.Text = "颜色号";
             // 
             // button1
             // 
             this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button1.Location = new System.Drawing.Point(1022, 518);
+            this.button1.Location = new System.Drawing.Point(1363, 691);
+            this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(177, 42);
+            this.button1.Size = new System.Drawing.Size(236, 56);
             this.button1.TabIndex = 214;
             this.button1.Text = "读取SN";
             this.button1.UseVisualStyleBackColor = true;
@@ -557,19 +567,32 @@
             this.autoprint.Checked = true;
             this.autoprint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.autoprint.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.autoprint.Location = new System.Drawing.Point(1002, 216);
-            this.autoprint.Margin = new System.Windows.Forms.Padding(4);
+            this.autoprint.Location = new System.Drawing.Point(1336, 288);
+            this.autoprint.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.autoprint.Name = "autoprint";
-            this.autoprint.Size = new System.Drawing.Size(118, 31);
+            this.autoprint.Size = new System.Drawing.Size(155, 39);
             this.autoprint.TabIndex = 215;
             this.autoprint.Text = "自动打印";
             this.autoprint.UseVisualStyleBackColor = true;
             // 
+            // pr_serial
+            // 
+            this.pr_serial.AutoSize = true;
+            this.pr_serial.CutLength = null;
+            this.pr_serial.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_serial.Location = new System.Drawing.Point(1379, 773);
+            this.pr_serial.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.pr_serial.MaximumSize = new System.Drawing.Size(300, 0);
+            this.pr_serial.Name = "pr_serial";
+            this.pr_serial.Size = new System.Drawing.Size(0, 41);
+            this.pr_serial.TabIndex = 216;
+            // 
             // Make_ColorBoxLabelPrint
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1407, 720);
+            this.ClientSize = new System.Drawing.Size(1876, 960);
+            this.Controls.Add(this.pr_serial);
             this.Controls.Add(this.autoprint);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.OperateResult);
@@ -610,7 +633,7 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.Name = "Make_ColorBoxLabelPrint";
             this.Tag = "Make!ColorBoxLabelPrint";
             this.Text = "标签打印";
@@ -667,5 +690,6 @@
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Button button1;
         private System.Windows.Forms.CheckBox autoprint;
+        private CustomControl.ValueLabel.ValueLabel pr_serial;
     }
 }

UAS_MES_JH/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -217,7 +217,7 @@ namespace UAS_MES_NEW.Make
                     {
                         //获取工单的其他信息
                         sql.Clear();
-                        sql.Append("select ma_code,nvl(ma_unlimitin,0)ma_unlimitin,pr_code,ma_softversion,pr_detail,pr_spec from  ");
+                        sql.Append("select pr_serial,ma_code,nvl(ma_unlimitin,0)ma_unlimitin,pr_code,ma_softversion,pr_detail,pr_spec from  ");
                         sql.Append("make left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "'");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count > 0)
@@ -687,7 +687,7 @@ namespace UAS_MES_NEW.Make
         {
             //Console.WriteLine("SN");
 
-            string sn_code = BaseUtil.GetDataAdb("shell getprop ro.serialno");
+            string sn_code = BaseUtil.GetDataAdb(pr_serial.Text == "" ? "shell getprop ro.serialno" : pr_serial.Text);
             OperateResult.AppendText("读取SN：" + sn_code + "\n");
             sncode.Text = sn_code;
             sn_code_KeyDown(this, new KeyEventArgs(Keys.Enter));

UAS_MES_JH/FunctionCode/Make/Make_ColorBoxLabelPrint2.cs

@@ -119,7 +119,7 @@ namespace UAS_MES_NEW.Make
             BaseUtil.SetFormValue(this.Controls, Dbfind);
             //获取工单的其他信息
             sql.Clear();
-            sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode as pr_code ,pr_detail,ma_softversion,");
+            sql.Append("select pr_serial,ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode as pr_code ,pr_detail,ma_softversion,");
             sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
             sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");

UAS_MES_JH/FunctionCode/Make/Make_FuselageLabelPrint.Designer.cs

@@ -69,6 +69,7 @@
             this.pr_detail = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             this.PrintNum = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.pr_serial = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
             ((System.ComponentModel.ISupportInitialize)(this.XmlWatcher)).BeginInit();
             this.SuspendLayout();
             // 
@@ -76,10 +77,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(1034, 165);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(1379, 220);
+            this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(86, 31);
+            this.label2.Size = new System.Drawing.Size(114, 41);
             this.label2.TabIndex = 180;
             this.label2.Text = "打印机";
             // 
@@ -87,10 +88,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(16, 159);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(21, 212);
+            this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(62, 31);
+            this.label1.Size = new System.Drawing.Size(82, 41);
             this.label1.TabIndex = 179;
             this.label1.Text = "标签";
             // 
@@ -98,10 +99,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(969, 48);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(1292, 64);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(110, 31);
+            this.pr_detail_label.Size = new System.Drawing.Size(146, 41);
             this.pr_detail_label.TabIndex = 171;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -111,10 +112,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(78, 675);
-            this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sncode_label.Location = new System.Drawing.Point(104, 900);
+            this.sncode_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(48, 31);
+            this.sncode_label.Size = new System.Drawing.Size(62, 41);
             this.sncode_label.TabIndex = 170;
             this.sncode_label.Text = "SN";
             // 
@@ -122,10 +123,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(969, 119);
-            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Location = new System.Drawing.Point(1292, 159);
+            this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(110, 31);
+            this.label4.Size = new System.Drawing.Size(146, 41);
             this.label4.TabIndex = 167;
             this.label4.Text = "打印张数";
             // 
@@ -133,10 +134,10 @@
             // 
             this.mcd_okqty_label.AutoSize = true;
             this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty_label.Location = new System.Drawing.Point(18, 111);
-            this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(24, 148);
+            this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.mcd_okqty_label.Name = "mcd_okqty_label";
-            this.mcd_okqty_label.Size = new System.Drawing.Size(110, 31);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(146, 41);
             this.mcd_okqty_label.TabIndex = 165;
             this.mcd_okqty_label.Text = "打印计数";
             // 
@@ -144,10 +145,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(562, 48);
-            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_code_label.Location = new System.Drawing.Point(749, 64);
+            this.pr_code_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(110, 31);
+            this.pr_code_label.Size = new System.Drawing.Size(146, 41);
             this.pr_code_label.TabIndex = 164;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -155,10 +156,10 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(15, 48);
-            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode_label.Location = new System.Drawing.Point(20, 64);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(110, 31);
+            this.ms_makecode_label.Size = new System.Drawing.Size(146, 41);
             this.ms_makecode_label.TabIndex = 163;
             this.ms_makecode_label.Text = "归属工单";
             // 
@@ -166,10 +167,10 @@
             // 
             this.CheckTSN.AutoSize = true;
             this.CheckTSN.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CheckTSN.Location = new System.Drawing.Point(1074, 674);
-            this.CheckTSN.Margin = new System.Windows.Forms.Padding(4);
+            this.CheckTSN.Location = new System.Drawing.Point(1432, 899);
+            this.CheckTSN.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.CheckTSN.Name = "CheckTSN";
-            this.CheckTSN.Size = new System.Drawing.Size(184, 35);
+            this.CheckTSN.Size = new System.Drawing.Size(240, 45);
             this.CheckTSN.TabIndex = 186;
             this.CheckTSN.Text = "是否检查TSN";
             this.CheckTSN.UseVisualStyleBackColor = true;
@@ -180,10 +181,10 @@
             // 
             this.CollectRemark.AutoSize = true;
             this.CollectRemark.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.CollectRemark.Location = new System.Drawing.Point(1099, 673);
-            this.CollectRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.CollectRemark.Location = new System.Drawing.Point(1465, 897);
+            this.CollectRemark.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.CollectRemark.Name = "CollectRemark";
-            this.CollectRemark.Size = new System.Drawing.Size(118, 31);
+            this.CollectRemark.Size = new System.Drawing.Size(155, 39);
             this.CollectRemark.TabIndex = 197;
             this.CollectRemark.Text = "采集备注";
             this.CollectRemark.UseVisualStyleBackColor = true;
@@ -199,9 +200,10 @@
             // ChooseFolder
             // 
             this.ChooseFolder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ChooseFolder.Location = new System.Drawing.Point(1274, 391);
+            this.ChooseFolder.Location = new System.Drawing.Point(1699, 521);
+            this.ChooseFolder.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChooseFolder.Name = "ChooseFolder";
-            this.ChooseFolder.Size = new System.Drawing.Size(117, 36);
+            this.ChooseFolder.Size = new System.Drawing.Size(156, 48);
             this.ChooseFolder.TabIndex = 200;
             this.ChooseFolder.Text = "选择文件夹";
             this.ChooseFolder.UseVisualStyleBackColor = true;
@@ -210,27 +212,30 @@
             // FolderPath
             // 
             this.FolderPath.Enabled = false;
-            this.FolderPath.Location = new System.Drawing.Point(1022, 397);
+            this.FolderPath.Location = new System.Drawing.Point(1363, 529);
+            this.FolderPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.FolderPath.Name = "FolderPath";
-            this.FolderPath.Size = new System.Drawing.Size(236, 28);
+            this.FolderPath.Size = new System.Drawing.Size(313, 35);
             this.FolderPath.TabIndex = 199;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(1121, 354);
+            this.label3.Location = new System.Drawing.Point(1495, 472);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(123, 30);
+            this.label3.Size = new System.Drawing.Size(162, 38);
             this.label3.TabIndex = 198;
             this.label3.Text = "监控文件夹";
             // 
             // StartWatch
             // 
             this.StartWatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.StartWatch.Location = new System.Drawing.Point(1064, 449);
+            this.StartWatch.Location = new System.Drawing.Point(1419, 599);
+            this.StartWatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.StartWatch.Name = "StartWatch";
-            this.StartWatch.Size = new System.Drawing.Size(96, 42);
+            this.StartWatch.Size = new System.Drawing.Size(128, 56);
             this.StartWatch.TabIndex = 201;
             this.StartWatch.Text = "开始监控";
             this.StartWatch.UseVisualStyleBackColor = true;
@@ -240,9 +245,10 @@
             // 
             this.StopWatch.Enabled = false;
             this.StopWatch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.StopWatch.Location = new System.Drawing.Point(1232, 449);
+            this.StopWatch.Location = new System.Drawing.Point(1643, 599);
+            this.StopWatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.StopWatch.Name = "StopWatch";
-            this.StopWatch.Size = new System.Drawing.Size(96, 42);
+            this.StopWatch.Size = new System.Drawing.Size(128, 56);
             this.StopWatch.TabIndex = 202;
             this.StopWatch.Text = "停止监控";
             this.StopWatch.UseVisualStyleBackColor = true;
@@ -254,10 +260,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(518, 675);
-            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Location = new System.Drawing.Point(691, 900);
+            this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(61, 31);
+            this.label5.Size = new System.Drawing.Size(80, 41);
             this.label5.TabIndex = 203;
             this.label5.Text = "SKU";
             // 
@@ -265,18 +271,19 @@
             // 
             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(562, 111);
-            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Location = new System.Drawing.Point(749, 148);
+            this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(110, 31);
+            this.label6.Size = new System.Drawing.Size(146, 41);
             this.label6.TabIndex = 206;
             this.label6.Text = "软件版本";
             // 
             // label7
             // 
             this.label7.Location = new System.Drawing.Point(0, 0);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(100, 23);
+            this.label7.Size = new System.Drawing.Size(133, 31);
             this.label7.TabIndex = 212;
             // 
             // label8
@@ -285,10 +292,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(999, 312);
-            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label8.Location = new System.Drawing.Point(1332, 416);
+            this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(129, 31);
+            this.label8.Size = new System.Drawing.Size(169, 41);
             this.label8.TabIndex = 211;
             this.label8.Text = "PRCOLOR";
             // 
@@ -298,19 +305,20 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(999, 267);
-            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label9.Location = new System.Drawing.Point(1332, 356);
+            this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(86, 31);
+            this.label9.Size = new System.Drawing.Size(114, 41);
             this.label9.TabIndex = 213;
             this.label9.Text = "颜色号";
             // 
             // button1
             // 
             this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button1.Location = new System.Drawing.Point(1022, 518);
+            this.button1.Location = new System.Drawing.Point(1363, 691);
+            this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(177, 42);
+            this.button1.Size = new System.Drawing.Size(236, 56);
             this.button1.TabIndex = 214;
             this.button1.Text = "读取SN";
             this.button1.UseVisualStyleBackColor = true;
@@ -322,10 +330,10 @@
             this.autoprint.Checked = true;
             this.autoprint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.autoprint.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.autoprint.Location = new System.Drawing.Point(1002, 216);
-            this.autoprint.Margin = new System.Windows.Forms.Padding(4);
+            this.autoprint.Location = new System.Drawing.Point(1336, 288);
+            this.autoprint.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.autoprint.Name = "autoprint";
-            this.autoprint.Size = new System.Drawing.Size(118, 31);
+            this.autoprint.Size = new System.Drawing.Size(155, 39);
             this.autoprint.TabIndex = 215;
             this.autoprint.Text = "自动打印";
             this.autoprint.UseVisualStyleBackColor = true;
@@ -333,10 +341,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(21, 194);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(28, 259);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(970, 456);
+            this.OperateResult.Size = new System.Drawing.Size(1292, 607);
             this.OperateResult.TabIndex = 168;
             this.OperateResult.Text = "";
             // 
@@ -347,11 +355,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.US_PRODUCTCOLOR.BackColor = System.Drawing.Color.White;
             this.US_PRODUCTCOLOR.ID = null;
-            this.US_PRODUCTCOLOR.Location = new System.Drawing.Point(1136, 312);
-            this.US_PRODUCTCOLOR.Margin = new System.Windows.Forms.Padding(4);
+            this.US_PRODUCTCOLOR.Location = new System.Drawing.Point(1515, 416);
+            this.US_PRODUCTCOLOR.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.US_PRODUCTCOLOR.Name = "US_PRODUCTCOLOR";
             this.US_PRODUCTCOLOR.Power = null;
-            this.US_PRODUCTCOLOR.Size = new System.Drawing.Size(255, 28);
+            this.US_PRODUCTCOLOR.Size = new System.Drawing.Size(339, 35);
             this.US_PRODUCTCOLOR.Str = null;
             this.US_PRODUCTCOLOR.Str1 = null;
             this.US_PRODUCTCOLOR.Str2 = null;
@@ -365,11 +373,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.US_COLORCODE.BackColor = System.Drawing.Color.White;
             this.US_COLORCODE.ID = null;
-            this.US_COLORCODE.Location = new System.Drawing.Point(1099, 267);
-            this.US_COLORCODE.Margin = new System.Windows.Forms.Padding(4);
+            this.US_COLORCODE.Location = new System.Drawing.Point(1465, 356);
+            this.US_COLORCODE.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.US_COLORCODE.Name = "US_COLORCODE";
             this.US_COLORCODE.Power = null;
-            this.US_COLORCODE.Size = new System.Drawing.Size(292, 28);
+            this.US_COLORCODE.Size = new System.Drawing.Size(388, 35);
             this.US_COLORCODE.Str = null;
             this.US_COLORCODE.Str1 = null;
             this.US_COLORCODE.Str2 = null;
@@ -381,11 +389,11 @@
             this.ma_softversion.AutoSize = true;
             this.ma_softversion.CutLength = null;
             this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_softversion.Location = new System.Drawing.Point(694, 113);
-            this.ma_softversion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_softversion.MaximumSize = new System.Drawing.Size(225, 0);
+            this.ma_softversion.Location = new System.Drawing.Point(925, 151);
+            this.ma_softversion.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.ma_softversion.MaximumSize = new System.Drawing.Size(300, 0);
             this.ma_softversion.Name = "ma_softversion";
-            this.ma_softversion.Size = new System.Drawing.Size(0, 31);
+            this.ma_softversion.Size = new System.Drawing.Size(0, 41);
             this.ma_softversion.TabIndex = 207;
             // 
             // lockCheckBox1
@@ -393,10 +401,10 @@
             this.lockCheckBox1.AutoSize = true;
             this.lockCheckBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lockCheckBox1.LeaveEvent = false;
-            this.lockCheckBox1.Location = new System.Drawing.Point(908, 675);
-            this.lockCheckBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.lockCheckBox1.Location = new System.Drawing.Point(1211, 900);
+            this.lockCheckBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.lockCheckBox1.Name = "lockCheckBox1";
-            this.lockCheckBox1.Size = new System.Drawing.Size(72, 28);
+            this.lockCheckBox1.Size = new System.Drawing.Size(94, 35);
             this.lockCheckBox1.TabIndex = 205;
             this.lockCheckBox1.Text = "锁定";
             this.lockCheckBox1.UseVisualStyleBackColor = true;
@@ -408,14 +416,14 @@
             this.US_SKU.Condition = null;
             this.US_SKU.DBTitle = null;
             this.US_SKU.FormName = null;
-            this.US_SKU.Location = new System.Drawing.Point(588, 675);
-            this.US_SKU.Margin = new System.Windows.Forms.Padding(4);
+            this.US_SKU.Location = new System.Drawing.Point(784, 900);
+            this.US_SKU.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.US_SKU.Name = "US_SKU";
             this.US_SKU.Power = null;
             this.US_SKU.ReturnData = null;
             this.US_SKU.SelectField = null;
             this.US_SKU.SetValueField = null;
-            this.US_SKU.Size = new System.Drawing.Size(310, 32);
+            this.US_SKU.Size = new System.Drawing.Size(413, 43);
             this.US_SKU.TabIndex = 204;
             this.US_SKU.TableName = null;
             this.US_SKU.TextBoxEnable = true;
@@ -423,10 +431,10 @@
             // Remark
             // 
             this.Remark.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Remark.Location = new System.Drawing.Point(1040, 644);
-            this.Remark.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Remark.Location = new System.Drawing.Point(1387, 859);
+            this.Remark.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.Remark.Name = "Remark";
-            this.Remark.Size = new System.Drawing.Size(304, 16);
+            this.Remark.Size = new System.Drawing.Size(404, 20);
             this.Remark.TabIndex = 196;
             this.Remark.Text = "";
             this.Remark.Visible = false;
@@ -434,9 +442,10 @@
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(975, 16);
+            this.StepCount.Location = new System.Drawing.Point(1300, 21);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(120, 33);
+            this.StepCount.Size = new System.Drawing.Size(160, 44);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 189;
@@ -446,10 +455,10 @@
             this.LockMakeCode.AutoSize = true;
             this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.LockMakeCode.LeaveEvent = false;
-            this.LockMakeCode.Location = new System.Drawing.Point(374, 48);
-            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(4);
+            this.LockMakeCode.Location = new System.Drawing.Point(499, 64);
+            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
+            this.LockMakeCode.Size = new System.Drawing.Size(94, 35);
             this.LockMakeCode.TabIndex = 185;
             this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.UseVisualStyleBackColor = true;
@@ -461,14 +470,14 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(135, 48);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
+            this.ma_code.Location = new System.Drawing.Point(180, 64);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.ReturnData = null;
             this.ma_code.SelectField = null;
             this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(224, 32);
+            this.ma_code.Size = new System.Drawing.Size(299, 43);
             this.ma_code.TabIndex = 184;
             this.ma_code.TableName = null;
             this.ma_code.TextBoxEnable = true;
@@ -478,28 +487,29 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(96, 161);
+            this.PrintLabel.Location = new System.Drawing.Point(128, 215);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(642, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(855, 32);
             this.PrintLabel.TabIndex = 181;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(1126, 165);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6);
+            this.Printer.Location = new System.Drawing.Point(1501, 220);
+            this.Printer.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(201, 38);
+            this.Printer.Size = new System.Drawing.Size(268, 51);
             this.Printer.TabIndex = 178;
             // 
             // mcd_okqty
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty.Location = new System.Drawing.Point(129, 111);
-            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_okqty.Location = new System.Drawing.Point(172, 148);
+            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(28, 31);
+            this.mcd_okqty.Size = new System.Drawing.Size(37, 41);
             this.mcd_okqty.TabIndex = 176;
             this.mcd_okqty.Text = "0";
             // 
@@ -508,11 +518,11 @@
             this.pr_code.AutoSize = true;
             this.pr_code.CutLength = null;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(694, 48);
-            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_code.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pr_code.Location = new System.Drawing.Point(925, 64);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.pr_code.MaximumSize = new System.Drawing.Size(300, 0);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 31);
+            this.pr_code.Size = new System.Drawing.Size(0, 41);
             this.pr_code.TabIndex = 175;
             this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
@@ -521,11 +531,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(1101, 48);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(225, 0);
+            this.pr_detail.Location = new System.Drawing.Point(1468, 64);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(300, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 31);
+            this.pr_detail.Size = new System.Drawing.Size(0, 41);
             this.pr_detail.TabIndex = 174;
             // 
             // PrintNum
@@ -534,12 +544,12 @@
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.Enabled = false;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(1101, 119);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
+            this.PrintNum.Location = new System.Drawing.Point(1468, 159);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(223, 28);
+            this.PrintNum.Size = new System.Drawing.Size(296, 35);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -553,11 +563,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(178, 675);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.sncode.Location = new System.Drawing.Point(237, 900);
+            this.sncode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(292, 28);
+            this.sncode.Size = new System.Drawing.Size(388, 35);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -565,11 +575,24 @@
             this.sncode.Tag = "ifread";
             this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sn_code_KeyDown);
             // 
+            // pr_serial
+            // 
+            this.pr_serial.AutoSize = true;
+            this.pr_serial.CutLength = null;
+            this.pr_serial.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_serial.Location = new System.Drawing.Point(1379, 767);
+            this.pr_serial.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.pr_serial.MaximumSize = new System.Drawing.Size(300, 0);
+            this.pr_serial.Name = "pr_serial";
+            this.pr_serial.Size = new System.Drawing.Size(0, 41);
+            this.pr_serial.TabIndex = 217;
+            // 
             // Make_FuselageLabelPrint
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1407, 720);
+            this.ClientSize = new System.Drawing.Size(1876, 960);
+            this.Controls.Add(this.pr_serial);
             this.Controls.Add(this.autoprint);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.OperateResult);
@@ -610,7 +633,7 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.Name = "Make_FuselageLabelPrint";
             this.Tag = "Make!FuselageLabelPrint";
             this.Text = "标签打印";
@@ -667,5 +690,6 @@
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Button button1;
         private System.Windows.Forms.CheckBox autoprint;
+        private CustomControl.ValueLabel.ValueLabel pr_serial;
     }
 }

UAS_MES_JH/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -114,7 +114,7 @@ namespace UAS_MES_NEW.Make
             BaseUtil.SetFormValue(this.Controls, Dbfind);
             //获取工单的其他信息
             sql.Clear();
-            sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode as pr_code ,pr_detail,ma_softversion,");
+            sql.Append("select pr_serial,ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode as pr_code ,pr_detail,ma_softversion,");
             sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
             sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -217,7 +217,7 @@ namespace UAS_MES_NEW.Make
                     {
                         //获取工单的其他信息
                         sql.Clear();
-                        sql.Append("select ma_code,nvl(ma_unlimitin,0)ma_unlimitin,pr_code,ma_softversion,pr_detail,pr_spec from  ");
+                        sql.Append("select pr_serial,ma_code,nvl(ma_unlimitin,0)ma_unlimitin,pr_code,ma_softversion,pr_detail,pr_spec from  ");
                         sql.Append("make left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "'");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count > 0)
@@ -680,7 +680,7 @@ namespace UAS_MES_NEW.Make
         {
             //Console.WriteLine("SN");
 
-            string sn_code = BaseUtil.GetDataAdb("shell getprop ro.serialno");
+            string sn_code = BaseUtil.GetDataAdb(pr_serial.Text == "" ? "shell getprop ro.serialno" : pr_serial.Text);
             OperateResult.AppendText("读取SN：" + sn_code + "\n");
             sncode.Text = sn_code;
             sn_code_KeyDown(this, new KeyEventArgs(Keys.Enter));