新增计数控件

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

@@ -40,6 +40,7 @@
             this.pr_code_label = new System.Windows.Forms.Label();
             this.ms_makecode_label = new System.Windows.Forms.Label();
             this.ma_code = new System.Windows.Forms.Label();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
             this.mcd_remainqty = new UAS_MES.CustomControl.ValueLabel.ValueNumLabel(this.components);
             this.mcd_okqty = new UAS_MES.CustomControl.ValueLabel.ValueNumLabel(this.components);
@@ -54,10 +55,10 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1035, 85);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
+            this.PrintLabel.Location = new System.Drawing.Point(767, 108);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(169, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(102, 20);
             this.PrintLabel.TabIndex = 181;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
@@ -65,10 +66,9 @@
             // 
             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(949, 21);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(699, 19);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(72, 27);
+            this.label2.Size = new System.Drawing.Size(58, 21);
             this.label2.TabIndex = 180;
             this.label2.Text = "打印机";
             // 
@@ -76,10 +76,9 @@
             // 
             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(949, 85);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(711, 108);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(52, 27);
+            this.label1.Size = new System.Drawing.Size(42, 21);
             this.label1.TabIndex = 179;
             this.label1.Text = "标签";
             // 
@@ -87,10 +86,9 @@
             // 
             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(600, 24);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(450, 19);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
             this.pr_detail_label.TabIndex = 171;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -100,10 +98,9 @@
             | 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(16, 519);
-            this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sncode_label.Location = new System.Drawing.Point(12, 415);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(72, 27);
+            this.sncode_label.Size = new System.Drawing.Size(58, 21);
             this.sncode_label.TabIndex = 170;
             this.sncode_label.Text = "序列号";
             // 
@@ -111,10 +108,9 @@
             // 
             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(600, 85);
-            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Location = new System.Drawing.Point(683, 69);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(92, 27);
+            this.label4.Size = new System.Drawing.Size(74, 21);
             this.label4.TabIndex = 167;
             this.label4.Text = "打印张数";
             // 
@@ -122,10 +118,9 @@
             // 
             this.mcd_remainqty_label.AutoSize = true;
             this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(308, 85);
-            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(231, 68);
             this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(72, 27);
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(58, 21);
             this.mcd_remainqty_label.TabIndex = 166;
             this.mcd_remainqty_label.Text = "剩余数";
             // 
@@ -133,10 +128,9 @@
             // 
             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(16, 85);
-            this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(12, 68);
             this.mcd_okqty_label.Name = "mcd_okqty_label";
-            this.mcd_okqty_label.Size = new System.Drawing.Size(92, 27);
+            this.mcd_okqty_label.Size = new System.Drawing.Size(74, 21);
             this.mcd_okqty_label.TabIndex = 165;
             this.mcd_okqty_label.Text = "打印计数";
             // 
@@ -144,10 +138,9 @@
             // 
             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(308, 24);
-            this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_code_label.Location = new System.Drawing.Point(231, 19);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(92, 27);
+            this.pr_code_label.Size = new System.Drawing.Size(74, 21);
             this.pr_code_label.TabIndex = 164;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -155,10 +148,9 @@
             // 
             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(16, 24);
-            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode_label.Location = new System.Drawing.Point(12, 19);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
+            this.ms_makecode_label.Size = new System.Drawing.Size(74, 21);
             this.ms_makecode_label.TabIndex = 163;
             this.ms_makecode_label.Text = "工单编号";
             // 
@@ -166,27 +158,38 @@
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_code.Location = new System.Drawing.Point(113, 26);
+            this.ma_code.Location = new System.Drawing.Point(85, 21);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 27);
+            this.ma_code.Size = new System.Drawing.Size(0, 21);
             this.ma_code.TabIndex = 182;
             // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(445, 69);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(88, 22);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 183;
+            // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(1035, 21);
-            this.Printer.Margin = new System.Windows.Forms.Padding(5);
+            this.Printer.Location = new System.Drawing.Point(763, 19);
+            this.Printer.Margin = new System.Windows.Forms.Padding(4);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(169, 31);
+            this.Printer.Size = new System.Drawing.Size(106, 25);
             this.Printer.TabIndex = 178;
             // 
             // mcd_remainqty
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(391, 85);
-            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty.Location = new System.Drawing.Point(293, 68);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(24, 27);
+            this.mcd_remainqty.Size = new System.Drawing.Size(19, 21);
             this.mcd_remainqty.TabIndex = 177;
             this.mcd_remainqty.Text = "0";
             // 
@@ -194,10 +197,9 @@
             // 
             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(113, 85);
-            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_okqty.Location = new System.Drawing.Point(85, 68);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(24, 27);
+            this.mcd_okqty.Size = new System.Drawing.Size(19, 21);
             this.mcd_okqty.TabIndex = 176;
             this.mcd_okqty.Text = "0";
             // 
@@ -206,11 +208,10 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(405, 26);
-            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(177, 0);
+            this.ma_prodcode.Location = new System.Drawing.Point(304, 21);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(133, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
             this.ma_prodcode.TabIndex = 175;
             this.ma_prodcode.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
@@ -219,11 +220,10 @@
             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(705, 26);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(177, 0);
+            this.pr_detail.Location = new System.Drawing.Point(529, 21);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(133, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 27);
+            this.pr_detail.Size = new System.Drawing.Size(0, 21);
             this.pr_detail.TabIndex = 174;
             // 
             // PrintNum
@@ -233,12 +233,11 @@
             this.PrintNum.Enabled = false;
             this.PrintNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(705, 85);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
+            this.PrintNum.Location = new System.Drawing.Point(767, 66);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(200, 27);
+            this.PrintNum.Size = new System.Drawing.Size(102, 23);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -252,11 +251,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(127, 519);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.sncode.Location = new System.Drawing.Point(95, 415);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(260, 25);
+            this.sncode.Size = new System.Drawing.Size(196, 21);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -267,18 +265,18 @@
             // 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, 135);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(16, 108);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(940, 364);
+            this.OperateResult.Size = new System.Drawing.Size(682, 292);
             this.OperateResult.TabIndex = 168;
             this.OperateResult.Text = "";
             // 
             // Make_FuselageLabelPrint
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1225, 560);
+            this.ClientSize = new System.Drawing.Size(914, 448);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.PrintLabel);
             this.Controls.Add(this.label2);
@@ -299,7 +297,6 @@
             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.Name = "Make_FuselageLabelPrint";
             this.Tag = "Make!FuselageLabelPrint";
             this.Text = "Make_FuselageLabelPrint";
@@ -333,5 +330,6 @@
         private System.Windows.Forms.Label pr_code_label;
         private System.Windows.Forms.Label ms_makecode_label;
         private System.Windows.Forms.Label ma_code;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
     }
 }

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -55,6 +55,11 @@ namespace UAS_MES.Make
             stw.ShowDialog();
             sncode.Focus();
             dh = new DataHelper();
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
 
         private void InPrint()

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

@@ -46,6 +46,7 @@
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.SuspendLayout();
             // 
             // columnHeader4
@@ -74,9 +75,10 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail.Location = new System.Drawing.Point(943, 29);
+            this.pr_detail.Location = new System.Drawing.Point(629, 19);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 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, 21);
             this.pr_detail.TabIndex = 31;
             // 
             // showResult
@@ -87,9 +89,10 @@
             this.columnHeader3,
             this.columnHeader4});
             this.showResult.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.showResult.Location = new System.Drawing.Point(706, 175);
+            this.showResult.Location = new System.Drawing.Point(471, 117);
+            this.showResult.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.showResult.Name = "showResult";
-            this.showResult.Size = new System.Drawing.Size(585, 383);
+            this.showResult.Size = new System.Drawing.Size(391, 257);
             this.showResult.TabIndex = 30;
             this.showResult.UseCompatibleStateImageBehavior = false;
             this.showResult.View = System.Windows.Forms.View.Details;
@@ -99,10 +102,11 @@
             this.sncode.AllPower = null;
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(108, 591);
+            this.sncode.Location = new System.Drawing.Point(72, 394);
+            this.sncode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(252, 28);
+            this.sncode.Size = new System.Drawing.Size(169, 21);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -113,18 +117,20 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(48, 591);
+            this.label10.Location = new System.Drawing.Point(32, 394);
+            this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(40, 27);
+            this.label10.Size = new System.Drawing.Size(28, 20);
             this.label10.TabIndex = 28;
             this.label10.Text = "SN";
             // 
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("宋体", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(43, 175);
+            this.OperateResult.Location = new System.Drawing.Point(29, 117);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(602, 383);
+            this.OperateResult.Size = new System.Drawing.Size(403, 257);
             this.OperateResult.TabIndex = 27;
             this.OperateResult.Text = "";
             // 
@@ -132,55 +138,61 @@
             // 
             this.remain_qty.AutoSize = true;
             this.remain_qty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty.Location = new System.Drawing.Point(153, 97);
+            this.remain_qty.Location = new System.Drawing.Point(102, 65);
+            this.remain_qty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.remain_qty.Name = "remain_qty";
-            this.remain_qty.Size = new System.Drawing.Size(0, 31);
+            this.remain_qty.Size = new System.Drawing.Size(0, 21);
             this.remain_qty.TabIndex = 26;
             // 
             // mcd_okqty
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.mcd_okqty.Location = new System.Drawing.Point(543, 97);
+            this.mcd_okqty.Location = new System.Drawing.Point(362, 65);
+            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(0, 31);
+            this.mcd_okqty.Size = new System.Drawing.Size(0, 21);
             this.mcd_okqty.TabIndex = 25;
             // 
             // ma_prodcode
             // 
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_prodcode.Location = new System.Drawing.Point(543, 29);
+            this.ma_prodcode.Location = new System.Drawing.Point(362, 19);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
             this.ma_prodcode.TabIndex = 24;
             // 
             // ma_code
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.Location = new System.Drawing.Point(153, 29);
+            this.ma_code.Location = new System.Drawing.Point(102, 19);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 31);
+            this.ma_code.Size = new System.Drawing.Size(0, 21);
             this.ma_code.TabIndex = 23;
             // 
             // label5
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label5.Location = new System.Drawing.Point(430, 97);
+            this.label5.Location = new System.Drawing.Point(287, 65);
+            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(62, 31);
+            this.label5.Size = new System.Drawing.Size(106, 21);
             this.label5.TabIndex = 22;
-            this.label5.Text = "计数";
+            this.label5.Text = "当前工单计数";
             // 
             // label4
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label4.Location = new System.Drawing.Point(40, 98);
+            this.label4.Location = new System.Drawing.Point(27, 65);
+            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(86, 31);
+            this.label4.Size = new System.Drawing.Size(58, 21);
             this.label4.TabIndex = 21;
             this.label4.Text = "剩余数";
             // 
@@ -188,9 +200,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label3.Location = new System.Drawing.Point(827, 29);
+            this.label3.Location = new System.Drawing.Point(551, 19);
+            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(110, 31);
+            this.label3.Size = new System.Drawing.Size(74, 21);
             this.label3.TabIndex = 20;
             this.label3.Text = "产品名称";
             // 
@@ -198,9 +211,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label2.Location = new System.Drawing.Point(427, 29);
+            this.label2.Location = new System.Drawing.Point(285, 19);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(110, 31);
+            this.label2.Size = new System.Drawing.Size(74, 21);
             this.label2.TabIndex = 19;
             this.label2.Text = "产品编号";
             // 
@@ -208,17 +222,30 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(37, 29);
+            this.label1.Location = new System.Drawing.Point(25, 19);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(110, 31);
+            this.label1.Size = new System.Drawing.Size(74, 21);
             this.label1.TabIndex = 18;
             this.label1.Text = "工单编号";
             // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(541, 65);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(88, 22);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 32;
+            // 
             // Make_ImeiCheck
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1329, 649);
+            this.ClientSize = new System.Drawing.Size(886, 433);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.showResult);
             this.Controls.Add(this.sncode);
@@ -234,12 +261,12 @@
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "Make_ImeiCheck";
             this.Tag = "Make!ImeiCheck";
-            this.Text = "Make_ImeiCheck";
             this.Load += new System.EventHandler(this.Make_LabelCheck_Load);
             this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -263,5 +290,6 @@
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label1;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
     }
 }

UAS-MES/FunctionCode/Make/Make_ImeiCheck.cs

@@ -49,6 +49,11 @@ namespace UAS_MES.Make
             OperateResult.AppendText(">>请输入SN\n", Color.Black);
             sql = new LogStringBuilder();
             dh = new DataHelper();
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
 
         private void Make_LabelCheck_SizeChanged(object sender, EventArgs e)

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

@@ -48,15 +48,17 @@
             this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.pr_detail = new System.Windows.Forms.Label();
             this.cancel = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.SuspendLayout();
             // 
             // label1
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(39, 30);
+            this.label1.Location = new System.Drawing.Point(26, 20);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(110, 31);
+            this.label1.Size = new System.Drawing.Size(74, 21);
             this.label1.TabIndex = 0;
             this.label1.Text = "工单编号";
             // 
@@ -64,9 +66,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label2.Location = new System.Drawing.Point(429, 30);
+            this.label2.Location = new System.Drawing.Point(286, 20);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(110, 31);
+            this.label2.Size = new System.Drawing.Size(74, 21);
             this.label2.TabIndex = 1;
             this.label2.Text = "产品编号";
             // 
@@ -74,9 +77,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label3.Location = new System.Drawing.Point(829, 30);
+            this.label3.Location = new System.Drawing.Point(553, 20);
+            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(110, 31);
+            this.label3.Size = new System.Drawing.Size(74, 21);
             this.label3.TabIndex = 2;
             this.label3.Text = "产品名称";
             // 
@@ -84,9 +88,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label4.Location = new System.Drawing.Point(42, 99);
+            this.label4.Location = new System.Drawing.Point(28, 66);
+            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(86, 31);
+            this.label4.Size = new System.Drawing.Size(58, 21);
             this.label4.TabIndex = 3;
             this.label4.Text = "剩余数";
             // 
@@ -94,55 +99,61 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label5.Location = new System.Drawing.Point(432, 98);
+            this.label5.Location = new System.Drawing.Point(288, 65);
+            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(62, 31);
+            this.label5.Size = new System.Drawing.Size(106, 21);
             this.label5.TabIndex = 4;
-            this.label5.Text = "计数";
+            this.label5.Text = "当前工单计数";
             // 
             // ma_code
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.Location = new System.Drawing.Point(155, 30);
+            this.ma_code.Location = new System.Drawing.Point(103, 20);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 31);
+            this.ma_code.Size = new System.Drawing.Size(0, 21);
             this.ma_code.TabIndex = 5;
             // 
             // ma_prodcode
             // 
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_prodcode.Location = new System.Drawing.Point(545, 30);
+            this.ma_prodcode.Location = new System.Drawing.Point(363, 20);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
             this.ma_prodcode.TabIndex = 6;
             // 
             // mcd_okqty
             // 
             this.mcd_okqty.AutoSize = true;
             this.mcd_okqty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.mcd_okqty.Location = new System.Drawing.Point(545, 98);
+            this.mcd_okqty.Location = new System.Drawing.Point(363, 65);
+            this.mcd_okqty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(0, 31);
+            this.mcd_okqty.Size = new System.Drawing.Size(0, 21);
             this.mcd_okqty.TabIndex = 7;
             // 
             // remain_qty
             // 
             this.remain_qty.AutoSize = true;
             this.remain_qty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty.Location = new System.Drawing.Point(155, 98);
+            this.remain_qty.Location = new System.Drawing.Point(103, 65);
+            this.remain_qty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.remain_qty.Name = "remain_qty";
-            this.remain_qty.Size = new System.Drawing.Size(0, 31);
+            this.remain_qty.Size = new System.Drawing.Size(0, 21);
             this.remain_qty.TabIndex = 8;
             // 
             // label10
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(50, 592);
+            this.label10.Location = new System.Drawing.Point(33, 395);
+            this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(40, 27);
+            this.label10.Size = new System.Drawing.Size(28, 20);
             this.label10.TabIndex = 12;
             this.label10.Text = "SN";
             // 
@@ -151,10 +162,11 @@
             this.sncode.AllPower = null;
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(110, 592);
+            this.sncode.Location = new System.Drawing.Point(73, 395);
+            this.sncode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(252, 28);
+            this.sncode.Size = new System.Drawing.Size(169, 21);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -164,9 +176,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("宋体", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(45, 176);
+            this.OperateResult.Location = new System.Drawing.Point(30, 117);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(602, 383);
+            this.OperateResult.Size = new System.Drawing.Size(403, 257);
             this.OperateResult.TabIndex = 10;
             this.OperateResult.Text = "";
             // 
@@ -178,9 +191,10 @@
             this.columnHeader3,
             this.columnHeader4});
             this.showResult.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.showResult.Location = new System.Drawing.Point(708, 176);
+            this.showResult.Location = new System.Drawing.Point(472, 117);
+            this.showResult.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.showResult.Name = "showResult";
-            this.showResult.Size = new System.Drawing.Size(585, 383);
+            this.showResult.Size = new System.Drawing.Size(391, 257);
             this.showResult.TabIndex = 15;
             this.showResult.UseCompatibleStateImageBehavior = false;
             this.showResult.View = System.Windows.Forms.View.Details;
@@ -211,9 +225,10 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail.Location = new System.Drawing.Point(945, 30);
+            this.pr_detail.Location = new System.Drawing.Point(630, 20);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 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, 21);
             this.pr_detail.TabIndex = 16;
             // 
             // cancel
@@ -223,22 +238,35 @@
             this.cancel.DownImage = ((System.Drawing.Image)(resources.GetObject("cancel.DownImage")));
             this.cancel.Image = null;
             this.cancel.IsShowBorder = true;
-            this.cancel.Location = new System.Drawing.Point(435, 592);
+            this.cancel.Location = new System.Drawing.Point(290, 395);
+            this.cancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cancel.MoveImage = ((System.Drawing.Image)(resources.GetObject("cancel.MoveImage")));
             this.cancel.Name = "cancel";
             this.cancel.NormalImage = ((System.Drawing.Image)(resources.GetObject("cancel.NormalImage")));
             this.cancel.Power = null;
-            this.cancel.Size = new System.Drawing.Size(88, 28);
+            this.cancel.Size = new System.Drawing.Size(59, 19);
             this.cancel.TabIndex = 17;
             this.cancel.Text = "重新核对";
             this.cancel.UseVisualStyleBackColor = false;
             this.cancel.Click += new System.EventHandler(this.cancel_Click);
             // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(542, 64);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(88, 22);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 33;
+            // 
             // Make_LabelCheck
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1329, 649);
+            this.ClientSize = new System.Drawing.Size(886, 433);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.cancel);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.showResult);
@@ -255,12 +283,13 @@
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "Make_LabelCheck";
             this.Tag = "Make!LabelCheck";
             this.Text = "标签核对";
             this.Load += new System.EventHandler(this.Make_LabelCheck_Load);
             this.SizeChanged += new System.EventHandler(this.Make_LabelCheck_SizeChanged);
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -286,5 +315,6 @@
         private System.Windows.Forms.ColumnHeader columnHeader4;
         private System.Windows.Forms.Label pr_detail;
         private CustomControl.ButtonUtil.NormalButton cancel;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
     }
 }

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -55,6 +55,11 @@ namespace UAS_MES.Make
             OperateResult.AppendText(">>请采集SN\n", Color.Black);
             sql = new LogStringBuilder();
             dh = new DataHelper();
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
 
         private void Make_LabelCheck_SizeChanged(object sender, EventArgs e)

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

@@ -72,6 +72,7 @@
             this.AutoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.OutBoxLength_label = new System.Windows.Forms.Label();
             this.OutBoxLength = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             ((System.ComponentModel.ISupportInitialize)(this.PackageInf)).BeginInit();
             this.SuspendLayout();
             // 
@@ -79,10 +80,9 @@
             // 
             this.pa_outboxcode_label.AutoSize = true;
             this.pa_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_outboxcode_label.Location = new System.Drawing.Point(6, 45);
-            this.pa_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_outboxcode_label.Location = new System.Drawing.Point(4, 42);
             this.pa_outboxcode_label.Name = "pa_outboxcode_label";
-            this.pa_outboxcode_label.Size = new System.Drawing.Size(72, 27);
+            this.pa_outboxcode_label.Size = new System.Drawing.Size(58, 21);
             this.pa_outboxcode_label.TabIndex = 102;
             this.pa_outboxcode_label.Text = "栈板号";
             // 
@@ -90,10 +90,9 @@
             // 
             this.pa_totalqty_label.AutoSize = true;
             this.pa_totalqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty_label.Location = new System.Drawing.Point(386, 96);
-            this.pa_totalqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_totalqty_label.Location = new System.Drawing.Point(290, 83);
             this.pa_totalqty_label.Name = "pa_totalqty_label";
-            this.pa_totalqty_label.Size = new System.Drawing.Size(92, 27);
+            this.pa_totalqty_label.Size = new System.Drawing.Size(74, 21);
             this.pa_totalqty_label.TabIndex = 104;
             this.pa_totalqty_label.Text = "已装数量";
             // 
@@ -101,10 +100,9 @@
             // 
             this.pa_makecode_label.AutoSize = true;
             this.pa_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode_label.Location = new System.Drawing.Point(386, 45);
-            this.pa_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_makecode_label.Location = new System.Drawing.Point(290, 42);
             this.pa_makecode_label.Name = "pa_makecode_label";
-            this.pa_makecode_label.Size = new System.Drawing.Size(92, 27);
+            this.pa_makecode_label.Size = new System.Drawing.Size(74, 21);
             this.pa_makecode_label.TabIndex = 108;
             this.pa_makecode_label.Text = "制造单号";
             // 
@@ -112,10 +110,9 @@
             // 
             this.pa_restqty_label.AutoSize = true;
             this.pa_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_restqty_label.Location = new System.Drawing.Point(1004, 159);
-            this.pa_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_restqty_label.Location = new System.Drawing.Point(753, 127);
             this.pa_restqty_label.Name = "pa_restqty_label";
-            this.pa_restqty_label.Size = new System.Drawing.Size(92, 27);
+            this.pa_restqty_label.Size = new System.Drawing.Size(74, 21);
             this.pa_restqty_label.TabIndex = 154;
             this.pa_restqty_label.Text = "打印张数";
             // 
@@ -123,10 +120,9 @@
             // 
             this.pa_salecode_label.AutoSize = true;
             this.pa_salecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode_label.Location = new System.Drawing.Point(1004, 45);
-            this.pa_salecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_salecode_label.Location = new System.Drawing.Point(753, 42);
             this.pa_salecode_label.Name = "pa_salecode_label";
-            this.pa_salecode_label.Size = new System.Drawing.Size(52, 27);
+            this.pa_salecode_label.Size = new System.Drawing.Size(42, 21);
             this.pa_salecode_label.TabIndex = 157;
             this.pa_salecode_label.Text = "合同";
             // 
@@ -134,10 +130,9 @@
             // 
             this.outboxcode_label.AutoSize = true;
             this.outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.outboxcode_label.Location = new System.Drawing.Point(951, 326);
-            this.outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.outboxcode_label.Location = new System.Drawing.Point(713, 261);
             this.outboxcode_label.Name = "outboxcode_label";
-            this.outboxcode_label.Size = new System.Drawing.Size(52, 27);
+            this.outboxcode_label.Size = new System.Drawing.Size(42, 21);
             this.outboxcode_label.TabIndex = 166;
             this.outboxcode_label.Text = "箱号";
             // 
@@ -145,10 +140,9 @@
             // 
             this.pa_prodcode_label.AutoSize = true;
             this.pa_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode_label.Location = new System.Drawing.Point(643, 45);
-            this.pa_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_prodcode_label.Location = new System.Drawing.Point(482, 42);
             this.pa_prodcode_label.Name = "pa_prodcode_label";
-            this.pa_prodcode_label.Size = new System.Drawing.Size(92, 27);
+            this.pa_prodcode_label.Size = new System.Drawing.Size(74, 21);
             this.pa_prodcode_label.TabIndex = 169;
             this.pa_prodcode_label.Text = "产品编号";
             // 
@@ -156,10 +150,10 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1127, 96);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
+            this.PrintLabel.Location = new System.Drawing.Point(845, 83);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(157, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(119, 20);
             this.PrintLabel.TabIndex = 172;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
@@ -167,10 +161,9 @@
             // 
             this.PrintLabel_label.AutoSize = true;
             this.PrintLabel_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintLabel_label.Location = new System.Drawing.Point(1004, 96);
-            this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.PrintLabel_label.Location = new System.Drawing.Point(753, 83);
             this.PrintLabel_label.Name = "PrintLabel_label";
-            this.PrintLabel_label.Size = new System.Drawing.Size(92, 27);
+            this.PrintLabel_label.Size = new System.Drawing.Size(74, 21);
             this.PrintLabel_label.TabIndex = 174;
             this.PrintLabel_label.Text = "标签文件";
             // 
@@ -178,10 +171,9 @@
             // 
             this.PrinterList_label.AutoSize = true;
             this.PrinterList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrinterList_label.Location = new System.Drawing.Point(643, 96);
-            this.PrinterList_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.PrinterList_label.Location = new System.Drawing.Point(482, 83);
             this.PrinterList_label.Name = "PrinterList_label";
-            this.PrinterList_label.Size = new System.Drawing.Size(112, 27);
+            this.PrinterList_label.Size = new System.Drawing.Size(90, 21);
             this.PrinterList_label.TabIndex = 173;
             this.PrinterList_label.Text = "打印机列表";
             // 
@@ -189,10 +181,9 @@
             // 
             this.pa_packageqty_label.AutoSize = true;
             this.pa_packageqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_packageqty_label.Location = new System.Drawing.Point(6, 96);
-            this.pa_packageqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_packageqty_label.Location = new System.Drawing.Point(4, 83);
             this.pa_packageqty_label.Name = "pa_packageqty_label";
-            this.pa_packageqty_label.Size = new System.Drawing.Size(92, 27);
+            this.pa_packageqty_label.Size = new System.Drawing.Size(74, 21);
             this.pa_packageqty_label.TabIndex = 176;
             this.pa_packageqty_label.Text = "栈板容量";
             // 
@@ -200,10 +191,9 @@
             // 
             this.AutoOutBoxCode.AutoSize = true;
             this.AutoOutBoxCode.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.AutoOutBoxCode.Location = new System.Drawing.Point(256, 13);
-            this.AutoOutBoxCode.Margin = new System.Windows.Forms.Padding(4);
+            this.AutoOutBoxCode.Location = new System.Drawing.Point(192, 16);
             this.AutoOutBoxCode.Name = "AutoOutBoxCode";
-            this.AutoOutBoxCode.Size = new System.Drawing.Size(100, 27);
+            this.AutoOutBoxCode.Size = new System.Drawing.Size(84, 24);
             this.AutoOutBoxCode.TabIndex = 180;
             this.AutoOutBoxCode.Text = "自动生成";
             this.AutoOutBoxCode.UseVisualStyleBackColor = true;
@@ -212,10 +202,9 @@
             // 
             this.pa_status.AutoSize = true;
             this.pa_status.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_status.Location = new System.Drawing.Point(1157, 218);
-            this.pa_status.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_status.Location = new System.Drawing.Point(868, 174);
             this.pa_status.Name = "pa_status";
-            this.pa_status.Size = new System.Drawing.Size(0, 27);
+            this.pa_status.Size = new System.Drawing.Size(0, 21);
             this.pa_status.TabIndex = 181;
             this.pa_status.Visible = false;
             // 
@@ -223,10 +212,9 @@
             // 
             this.Cancel.AutoSize = true;
             this.Cancel.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.Cancel.Location = new System.Drawing.Point(1216, 324);
-            this.Cancel.Margin = new System.Windows.Forms.Padding(4);
+            this.Cancel.Location = new System.Drawing.Point(912, 259);
             this.Cancel.Name = "Cancel";
-            this.Cancel.Size = new System.Drawing.Size(100, 27);
+            this.Cancel.Size = new System.Drawing.Size(84, 24);
             this.Cancel.TabIndex = 185;
             this.Cancel.Text = "取消采集";
             this.Cancel.UseVisualStyleBackColor = true;
@@ -234,10 +222,9 @@
             // pr_packrule
             // 
             this.pr_packrule.AutoSize = true;
-            this.pr_packrule.Location = new System.Drawing.Point(999, 651);
-            this.pr_packrule.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_packrule.Location = new System.Drawing.Point(749, 521);
             this.pr_packrule.Name = "pr_packrule";
-            this.pr_packrule.Size = new System.Drawing.Size(0, 15);
+            this.pr_packrule.Size = new System.Drawing.Size(0, 12);
             this.pr_packrule.TabIndex = 186;
             this.pr_packrule.Visible = false;
             // 
@@ -245,40 +232,36 @@
             // 
             this.pa_salecode.AutoSize = true;
             this.pa_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode.Location = new System.Drawing.Point(1125, 45);
-            this.pa_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_salecode.Location = new System.Drawing.Point(844, 42);
             this.pa_salecode.Name = "pa_salecode";
-            this.pa_salecode.Size = new System.Drawing.Size(0, 27);
+            this.pa_salecode.Size = new System.Drawing.Size(0, 21);
             this.pa_salecode.TabIndex = 187;
             this.pa_salecode.Visible = false;
             // 
             // pd_makecode
             // 
             this.pd_makecode.AutoSize = true;
-            this.pd_makecode.Location = new System.Drawing.Point(1064, 375);
-            this.pd_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pd_makecode.Location = new System.Drawing.Point(798, 300);
             this.pd_makecode.Name = "pd_makecode";
-            this.pd_makecode.Size = new System.Drawing.Size(0, 15);
+            this.pd_makecode.Size = new System.Drawing.Size(0, 12);
             this.pd_makecode.TabIndex = 188;
             this.pd_makecode.Visible = false;
             // 
             // pd_prodcode
             // 
             this.pd_prodcode.AutoSize = true;
-            this.pd_prodcode.Location = new System.Drawing.Point(999, 374);
-            this.pd_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pd_prodcode.Location = new System.Drawing.Point(749, 299);
             this.pd_prodcode.Name = "pd_prodcode";
-            this.pd_prodcode.Size = new System.Drawing.Size(0, 15);
+            this.pd_prodcode.Size = new System.Drawing.Size(0, 12);
             this.pd_prodcode.TabIndex = 189;
             this.pd_prodcode.Visible = false;
             // 
             // pd_salecode
             // 
             this.pd_salecode.AutoSize = true;
-            this.pd_salecode.Location = new System.Drawing.Point(1221, 372);
-            this.pd_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pd_salecode.Location = new System.Drawing.Point(916, 298);
             this.pd_salecode.Name = "pd_salecode";
-            this.pd_salecode.Size = new System.Drawing.Size(0, 15);
+            this.pd_salecode.Size = new System.Drawing.Size(0, 12);
             this.pd_salecode.TabIndex = 190;
             this.pd_salecode.Visible = false;
             // 
@@ -287,11 +270,11 @@
             this.pa_standardqty.AllPower = null;
             this.pa_standardqty.BackColor = System.Drawing.Color.White;
             this.pa_standardqty.ID = null;
-            this.pa_standardqty.Location = new System.Drawing.Point(113, 98);
-            this.pa_standardqty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pa_standardqty.Location = new System.Drawing.Point(85, 84);
+            this.pa_standardqty.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.pa_standardqty.Name = "pa_standardqty";
             this.pa_standardqty.Power = null;
-            this.pa_standardqty.Size = new System.Drawing.Size(151, 25);
+            this.pa_standardqty.Size = new System.Drawing.Size(114, 21);
             this.pa_standardqty.Str = null;
             this.pa_standardqty.Str1 = null;
             this.pa_standardqty.Str2 = null;
@@ -304,11 +287,10 @@
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.Enabled = false;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(1127, 161);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
+            this.PrintNum.Location = new System.Drawing.Point(845, 129);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(157, 25);
+            this.PrintNum.Size = new System.Drawing.Size(119, 21);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -321,13 +303,12 @@
             this.Packing.DownImage = ((System.Drawing.Image)(resources.GetObject("Packing.DownImage")));
             this.Packing.Image = ((System.Drawing.Image)(resources.GetObject("Packing.Image")));
             this.Packing.IsShowBorder = true;
-            this.Packing.Location = new System.Drawing.Point(1203, 266);
-            this.Packing.Margin = new System.Windows.Forms.Padding(4);
+            this.Packing.Location = new System.Drawing.Point(902, 213);
             this.Packing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Packing.MoveImage")));
             this.Packing.Name = "Packing";
             this.Packing.NormalImage = ((System.Drawing.Image)(resources.GetObject("Packing.NormalImage")));
             this.Packing.Power = null;
-            this.Packing.Size = new System.Drawing.Size(75, 30);
+            this.Packing.Size = new System.Drawing.Size(56, 24);
             this.Packing.TabIndex = 178;
             this.Packing.Text = "封栈板";
             this.Packing.UseVisualStyleBackColor = true;
@@ -335,10 +316,10 @@
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(790, 96);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(5);
+            this.PrinterList.Location = new System.Drawing.Point(592, 83);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(176, 25);
+            this.PrinterList.Size = new System.Drawing.Size(132, 20);
             this.PrinterList.TabIndex = 171;
             // 
             // pa_prodcode
@@ -346,11 +327,10 @@
             this.pa_prodcode.AutoSize = true;
             this.pa_prodcode.CutLength = null;
             this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode.Location = new System.Drawing.Point(784, 45);
-            this.pa_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_prodcode.Location = new System.Drawing.Point(588, 42);
+            this.pa_prodcode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_prodcode.Name = "pa_prodcode";
-            this.pa_prodcode.Size = new System.Drawing.Size(0, 27);
+            this.pa_prodcode.Size = new System.Drawing.Size(0, 21);
             this.pa_prodcode.TabIndex = 170;
             this.pa_prodcode.Tag = "1";
             this.pa_prodcode.TextChanged += new System.EventHandler(this.pa_prodcode_TextChanged);
@@ -362,13 +342,12 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1105, 638);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4);
+            this.Clean.Location = new System.Drawing.Point(829, 510);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(80, 30);
+            this.Clean.Size = new System.Drawing.Size(60, 24);
             this.Clean.TabIndex = 168;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -377,10 +356,9 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(953, 375);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(715, 300);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(368, 254);
+            this.OperateResult.Size = new System.Drawing.Size(277, 204);
             this.OperateResult.TabIndex = 167;
             this.OperateResult.Text = "";
             // 
@@ -389,11 +367,10 @@
             this.outboxcode.AllPower = "ifall";
             this.outboxcode.BackColor = System.Drawing.Color.White;
             this.outboxcode.ID = null;
-            this.outboxcode.Location = new System.Drawing.Point(1019, 326);
-            this.outboxcode.Margin = new System.Windows.Forms.Padding(4);
+            this.outboxcode.Location = new System.Drawing.Point(764, 261);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = "ifread";
-            this.outboxcode.Size = new System.Drawing.Size(175, 25);
+            this.outboxcode.Size = new System.Drawing.Size(132, 21);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
             this.outboxcode.Str2 = null;
@@ -406,11 +383,10 @@
             this.pa_outboxcode.AllPower = "ifall";
             this.pa_outboxcode.BackColor = System.Drawing.Color.White;
             this.pa_outboxcode.ID = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(113, 47);
-            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4);
+            this.pa_outboxcode.Location = new System.Drawing.Point(85, 44);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Power = "ifread";
-            this.pa_outboxcode.Size = new System.Drawing.Size(229, 25);
+            this.pa_outboxcode.Size = new System.Drawing.Size(173, 21);
             this.pa_outboxcode.Str = null;
             this.pa_outboxcode.Str1 = null;
             this.pa_outboxcode.Str2 = null;
@@ -425,13 +401,12 @@
             this.Printlab.DownImage = ((System.Drawing.Image)(resources.GetObject("Printlab.DownImage")));
             this.Printlab.Image = ((System.Drawing.Image)(resources.GetObject("Printlab.Image")));
             this.Printlab.IsShowBorder = true;
-            this.Printlab.Location = new System.Drawing.Point(1101, 266);
-            this.Printlab.Margin = new System.Windows.Forms.Padding(4);
+            this.Printlab.Location = new System.Drawing.Point(826, 213);
             this.Printlab.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printlab.MoveImage")));
             this.Printlab.Name = "Printlab";
             this.Printlab.NormalImage = ((System.Drawing.Image)(resources.GetObject("Printlab.NormalImage")));
             this.Printlab.Power = null;
-            this.Printlab.Size = new System.Drawing.Size(60, 30);
+            this.Printlab.Size = new System.Drawing.Size(45, 24);
             this.Printlab.TabIndex = 161;
             this.Printlab.Text = "打印";
             this.Printlab.UseVisualStyleBackColor = true;
@@ -444,13 +419,12 @@
             this.ReleasePallet.DownImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.DownImage")));
             this.ReleasePallet.Image = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.Image")));
             this.ReleasePallet.IsShowBorder = true;
-            this.ReleasePallet.Location = new System.Drawing.Point(987, 266);
-            this.ReleasePallet.Margin = new System.Windows.Forms.Padding(4);
+            this.ReleasePallet.Location = new System.Drawing.Point(740, 213);
             this.ReleasePallet.MoveImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.MoveImage")));
             this.ReleasePallet.Name = "ReleasePallet";
             this.ReleasePallet.NormalImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.NormalImage")));
             this.ReleasePallet.Power = null;
-            this.ReleasePallet.Size = new System.Drawing.Size(75, 30);
+            this.ReleasePallet.Size = new System.Drawing.Size(56, 24);
             this.ReleasePallet.TabIndex = 160;
             this.ReleasePallet.Text = "解除栈板";
             this.ReleasePallet.UseVisualStyleBackColor = true;
@@ -463,13 +437,12 @@
             this.NewPalletCode.DownImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.DownImage")));
             this.NewPalletCode.Image = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.Image")));
             this.NewPalletCode.IsShowBorder = true;
-            this.NewPalletCode.Location = new System.Drawing.Point(1221, 12);
-            this.NewPalletCode.Margin = new System.Windows.Forms.Padding(4);
+            this.NewPalletCode.Location = new System.Drawing.Point(916, 16);
             this.NewPalletCode.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.MoveImage")));
             this.NewPalletCode.Name = "NewPalletCode";
             this.NewPalletCode.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.NormalImage")));
             this.NewPalletCode.Power = "ifread";
-            this.NewPalletCode.Size = new System.Drawing.Size(80, 30);
+            this.NewPalletCode.Size = new System.Drawing.Size(60, 24);
             this.NewPalletCode.TabIndex = 159;
             this.NewPalletCode.Text = "新增栈板";
             this.NewPalletCode.UseVisualStyleBackColor = true;
@@ -481,11 +454,10 @@
             this.pa_custcode.AutoSize = true;
             this.pa_custcode.CutLength = null;
             this.pa_custcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_custcode.Location = new System.Drawing.Point(966, 217);
-            this.pa_custcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_custcode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_custcode.Location = new System.Drawing.Point(724, 174);
+            this.pa_custcode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_custcode.Name = "pa_custcode";
-            this.pa_custcode.Size = new System.Drawing.Size(0, 27);
+            this.pa_custcode.Size = new System.Drawing.Size(0, 21);
             this.pa_custcode.TabIndex = 158;
             this.pa_custcode.Tag = "1";
             // 
@@ -500,11 +472,10 @@
             this.Column4,
             this.Column5});
             this.PackageInf.EnableContentClick = true;
-            this.PackageInf.Location = new System.Drawing.Point(4, 161);
-            this.PackageInf.Margin = new System.Windows.Forms.Padding(4);
+            this.PackageInf.Location = new System.Drawing.Point(3, 129);
             this.PackageInf.Name = "PackageInf";
             this.PackageInf.RowTemplate.Height = 23;
-            this.PackageInf.Size = new System.Drawing.Size(941, 519);
+            this.PackageInf.Size = new System.Drawing.Size(706, 415);
             this.PackageInf.TabIndex = 156;
             // 
             // pd_outboxcode
@@ -548,11 +519,10 @@
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.CutLength = null;
             this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode.Location = new System.Drawing.Point(498, 45);
-            this.pa_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_makecode.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_makecode.Location = new System.Drawing.Point(374, 42);
+            this.pa_makecode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_makecode.Name = "pa_makecode";
-            this.pa_makecode.Size = new System.Drawing.Size(0, 27);
+            this.pa_makecode.Size = new System.Drawing.Size(0, 21);
             this.pa_makecode.TabIndex = 109;
             this.pa_makecode.Tag = "1";
             // 
@@ -561,31 +531,29 @@
             this.pa_totalqty.AutoSize = true;
             this.pa_totalqty.CutLength = null;
             this.pa_totalqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty.Location = new System.Drawing.Point(498, 96);
-            this.pa_totalqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pa_totalqty.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pa_totalqty.Location = new System.Drawing.Point(374, 83);
+            this.pa_totalqty.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_totalqty.Name = "pa_totalqty";
-            this.pa_totalqty.Size = new System.Drawing.Size(0, 27);
+            this.pa_totalqty.Size = new System.Drawing.Size(0, 21);
             this.pa_totalqty.TabIndex = 105;
             this.pa_totalqty.Tag = "1";
             // 
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(1009, 217);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.AutoPrint.Location = new System.Drawing.Point(757, 174);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(112, 28);
+            this.AutoPrint.Size = new System.Drawing.Size(84, 22);
             this.AutoPrint.TabIndex = 191;
             // 
             // OutBoxLength_label
             // 
             this.OutBoxLength_label.AutoSize = true;
             this.OutBoxLength_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLength_label.Location = new System.Drawing.Point(109, 12);
-            this.OutBoxLength_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.OutBoxLength_label.Location = new System.Drawing.Point(82, 16);
             this.OutBoxLength_label.Name = "OutBoxLength_label";
-            this.OutBoxLength_label.Size = new System.Drawing.Size(46, 24);
+            this.OutBoxLength_label.Size = new System.Drawing.Size(37, 20);
             this.OutBoxLength_label.TabIndex = 193;
             this.OutBoxLength_label.Text = "长度";
             // 
@@ -595,22 +563,34 @@
             this.OutBoxLength.BackColor = System.Drawing.Color.White;
             this.OutBoxLength.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.OutBoxLength.ID = null;
-            this.OutBoxLength.Location = new System.Drawing.Point(167, 12);
-            this.OutBoxLength.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
+            this.OutBoxLength.Location = new System.Drawing.Point(125, 16);
+            this.OutBoxLength.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
             this.OutBoxLength.Name = "OutBoxLength";
             this.OutBoxLength.Power = null;
-            this.OutBoxLength.Size = new System.Drawing.Size(49, 27);
+            this.OutBoxLength.Size = new System.Drawing.Size(38, 23);
             this.OutBoxLength.Str = null;
             this.OutBoxLength.Str1 = null;
             this.OutBoxLength.Str2 = null;
             this.OutBoxLength.TabIndex = 192;
             this.OutBoxLength.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OutBoxLength_KeyDown);
             // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(486, 11);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(88, 22);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 194;
+            // 
             // Make_PalletCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1329, 690);
+            this.ClientSize = new System.Drawing.Size(997, 552);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.OutBoxLength_label);
             this.Controls.Add(this.OutBoxLength);
             this.Controls.Add(this.AutoPrint);
@@ -650,7 +630,6 @@
             this.Controls.Add(this.pa_totalqty_label);
             this.Controls.Add(this.pa_outboxcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_PalletCollection";
             this.Tag = "Make!BigBoxCollection";
             this.Text = " ";
@@ -707,5 +686,6 @@
         private CustomControl.CustomCheckBox.AutoPrintCheckBox AutoPrint;
         private System.Windows.Forms.Label OutBoxLength_label;
         private CustomControl.TextBoxWithIcon.SnCollectionBox OutBoxLength;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
     }
 }

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -71,6 +71,11 @@ namespace UAS_MES.Make
             stw.ShowDialog();
             OutBoxLength.Text = BaseUtil.GetCacheData("PalletLength").ToString();
             dh = new DataHelper();
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
 
         private void Clean_Click(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_PalletCollection.resx

@@ -788,19 +788,4 @@
   <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="pd_outboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_innerqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

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

@@ -46,6 +46,7 @@
             this.sn_code_label = new System.Windows.Forms.Label();
             this.ma_softversion = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.ChangeResult = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
             this.show_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ma_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -63,9 +64,10 @@
             // 
             this.ms_macode_label.AutoSize = true;
             this.ms_macode_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_macode_label.Location = new System.Drawing.Point(29, 26);
+            this.ms_macode_label.Location = new System.Drawing.Point(19, 17);
+            this.ms_macode_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ms_macode_label.Name = "ms_macode_label";
-            this.ms_macode_label.Size = new System.Drawing.Size(110, 31);
+            this.ms_macode_label.Size = new System.Drawing.Size(74, 21);
             this.ms_macode_label.TabIndex = 0;
             this.ms_macode_label.Text = "工单编号";
             // 
@@ -73,9 +75,10 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_prodcode_label.Location = new System.Drawing.Point(433, 26);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(289, 17);
+            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(110, 31);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(74, 21);
             this.ma_prodcode_label.TabIndex = 1;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -83,9 +86,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail_label.Location = new System.Drawing.Point(791, 26);
+            this.pr_detail_label.Location = new System.Drawing.Point(527, 17);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 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(74, 21);
             this.pr_detail_label.TabIndex = 2;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -93,9 +97,10 @@
             // 
             this.remain_qty_label.AutoSize = true;
             this.remain_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty_label.Location = new System.Drawing.Point(29, 68);
+            this.remain_qty_label.Location = new System.Drawing.Point(19, 45);
+            this.remain_qty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.remain_qty_label.Name = "remain_qty_label";
-            this.remain_qty_label.Size = new System.Drawing.Size(86, 31);
+            this.remain_qty_label.Size = new System.Drawing.Size(58, 21);
             this.remain_qty_label.TabIndex = 3;
             this.remain_qty_label.Text = "剩余数";
             // 
@@ -103,19 +108,22 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.PrintNum_label.Location = new System.Drawing.Point(433, 68);
+            this.PrintNum_label.Location = new System.Drawing.Point(638, 414);
+            this.PrintNum_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.PrintNum_label.Name = "PrintNum_label";
-            this.PrintNum_label.Size = new System.Drawing.Size(62, 31);
+            this.PrintNum_label.Size = new System.Drawing.Size(42, 21);
             this.PrintNum_label.TabIndex = 4;
             this.PrintNum_label.Text = "计数";
+            this.PrintNum_label.Visible = false;
             // 
             // ms_macode
             // 
             this.ms_macode.AutoSize = true;
             this.ms_macode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_macode.Location = new System.Drawing.Point(141, 26);
+            this.ms_macode.Location = new System.Drawing.Point(94, 17);
+            this.ms_macode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ms_macode.Name = "ms_macode";
-            this.ms_macode.Size = new System.Drawing.Size(0, 31);
+            this.ms_macode.Size = new System.Drawing.Size(0, 21);
             this.ms_macode.TabIndex = 5;
             this.ms_macode.TextChanged += new System.EventHandler(this.ms_macode_TextChanged);
             // 
@@ -123,29 +131,32 @@
             // 
             this.remain_qty.AutoSize = true;
             this.remain_qty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty.Location = new System.Drawing.Point(141, 67);
+            this.remain_qty.Location = new System.Drawing.Point(94, 45);
+            this.remain_qty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.remain_qty.Name = "remain_qty";
-            this.remain_qty.Size = new System.Drawing.Size(0, 31);
+            this.remain_qty.Size = new System.Drawing.Size(0, 21);
             this.remain_qty.TabIndex = 6;
             // 
             // count
             // 
             this.count.AutoSize = true;
             this.count.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.count.Location = new System.Drawing.Point(545, 68);
+            this.count.Location = new System.Drawing.Point(712, 414);
+            this.count.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.count.Name = "count";
-            this.count.Size = new System.Drawing.Size(28, 31);
+            this.count.Size = new System.Drawing.Size(19, 21);
             this.count.TabIndex = 8;
             this.count.Text = "0";
+            this.count.Visible = false;
             // 
             // TSNLength_checkBox
             // 
             this.TSNLength_checkBox.AutoSize = true;
             this.TSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.TSNLength_checkBox.Location = new System.Drawing.Point(37, 121);
-            this.TSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.TSNLength_checkBox.Location = new System.Drawing.Point(25, 81);
+            this.TSNLength_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.TSNLength_checkBox.Name = "TSNLength_checkBox";
-            this.TSNLength_checkBox.Size = new System.Drawing.Size(117, 31);
+            this.TSNLength_checkBox.Size = new System.Drawing.Size(83, 24);
             this.TSNLength_checkBox.TabIndex = 10;
             this.TSNLength_checkBox.Text = "TSN长度";
             this.TSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -154,10 +165,10 @@
             // 
             this.SNLength_checkBox.AutoSize = true;
             this.SNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.SNLength_checkBox.Location = new System.Drawing.Point(37, 167);
-            this.SNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.SNLength_checkBox.Location = new System.Drawing.Point(25, 111);
+            this.SNLength_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.SNLength_checkBox.Name = "SNLength_checkBox";
-            this.SNLength_checkBox.Size = new System.Drawing.Size(106, 31);
+            this.SNLength_checkBox.Size = new System.Drawing.Size(75, 24);
             this.SNLength_checkBox.TabIndex = 11;
             this.SNLength_checkBox.Text = "SN长度";
             this.SNLength_checkBox.UseVisualStyleBackColor = true;
@@ -166,10 +177,10 @@
             // 
             this.TSNPre_checkBox.AutoSize = true;
             this.TSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.TSNPre_checkBox.Location = new System.Drawing.Point(642, 120);
-            this.TSNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.TSNPre_checkBox.Location = new System.Drawing.Point(428, 80);
+            this.TSNPre_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.TSNPre_checkBox.Name = "TSNPre_checkBox";
-            this.TSNPre_checkBox.Size = new System.Drawing.Size(117, 31);
+            this.TSNPre_checkBox.Size = new System.Drawing.Size(83, 24);
             this.TSNPre_checkBox.TabIndex = 12;
             this.TSNPre_checkBox.Text = "TSN前缀";
             this.TSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -178,10 +189,10 @@
             // 
             this.SNPre_checkBox.AutoSize = true;
             this.SNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.SNPre_checkBox.Location = new System.Drawing.Point(642, 168);
-            this.SNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.SNPre_checkBox.Location = new System.Drawing.Point(428, 112);
+            this.SNPre_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.SNPre_checkBox.Name = "SNPre_checkBox";
-            this.SNPre_checkBox.Size = new System.Drawing.Size(106, 31);
+            this.SNPre_checkBox.Size = new System.Drawing.Size(75, 24);
             this.SNPre_checkBox.TabIndex = 13;
             this.SNPre_checkBox.Text = "SN前缀";
             this.SNPre_checkBox.UseVisualStyleBackColor = true;
@@ -190,9 +201,10 @@
             // 
             this.tip.AutoSize = true;
             this.tip.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold);
-            this.tip.Location = new System.Drawing.Point(29, 207);
+            this.tip.Location = new System.Drawing.Point(19, 138);
+            this.tip.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.tip.Name = "tip";
-            this.tip.Size = new System.Drawing.Size(158, 31);
+            this.tip.Size = new System.Drawing.Size(106, 22);
             this.tip.TabIndex = 18;
             this.tip.Text = "采集提示信息";
             // 
@@ -200,9 +212,10 @@
             // 
             this.in_label.AutoSize = true;
             this.in_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.in_label.Location = new System.Drawing.Point(29, 625);
+            this.in_label.Location = new System.Drawing.Point(19, 417);
+            this.in_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.in_label.Name = "in_label";
-            this.in_label.Size = new System.Drawing.Size(86, 31);
+            this.in_label.Size = new System.Drawing.Size(58, 21);
             this.in_label.TabIndex = 21;
             this.in_label.Text = "录入框";
             // 
@@ -210,10 +223,9 @@
             // 
             this.ClearSn_code.Cursor = System.Windows.Forms.Cursors.Hand;
             this.ClearSn_code.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
-            this.ClearSn_code.Location = new System.Drawing.Point(400, 572);
-            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ClearSn_code.Location = new System.Drawing.Point(267, 381);
             this.ClearSn_code.Name = "ClearSn_code";
-            this.ClearSn_code.Size = new System.Drawing.Size(24, 24);
+            this.ClearSn_code.Size = new System.Drawing.Size(16, 16);
             this.ClearSn_code.TabIndex = 144;
             this.ClearSn_code.TabStop = false;
             this.ClearSn_code.Click += new System.EventHandler(this.cancel_Click);
@@ -222,10 +234,9 @@
             // 
             this.sn_code_label.AutoSize = true;
             this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_label.Location = new System.Drawing.Point(29, 572);
-            this.sn_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sn_code_label.Location = new System.Drawing.Point(19, 381);
             this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(86, 31);
+            this.sn_code_label.Size = new System.Drawing.Size(58, 21);
             this.sn_code_label.TabIndex = 142;
             this.sn_code_label.Text = "序列号";
             // 
@@ -233,31 +244,42 @@
             // 
             this.ma_softversion.AutoSize = true;
             this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_softversion.Location = new System.Drawing.Point(907, 68);
+            this.ma_softversion.Location = new System.Drawing.Point(605, 45);
+            this.ma_softversion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 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, 21);
             this.ma_softversion.TabIndex = 150;
             // 
             // label2
             // 
             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(790, 68);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(527, 45);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(110, 31);
+            this.label2.Size = new System.Drawing.Size(74, 21);
             this.label2.TabIndex = 149;
             this.label2.Text = "软件版本";
             // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(290, 45);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(88, 22);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 195;
+            // 
             // ChangeResult
             // 
             this.ChangeResult.AutoSize = true;
             this.ChangeResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ChangeResult.Location = new System.Drawing.Point(400, 620);
-            this.ChangeResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.ChangeResult.Location = new System.Drawing.Point(267, 413);
+            this.ChangeResult.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.ChangeResult.Name = "ChangeResult";
             this.ChangeResult.Power = "ifspecial";
-            this.ChangeResult.Size = new System.Drawing.Size(136, 35);
+            this.ChangeResult.Size = new System.Drawing.Size(93, 25);
             this.ChangeResult.TabIndex = 145;
             this.ChangeResult.Text = "重新转换";
             this.ChangeResult.UseVisualStyleBackColor = true;
@@ -270,11 +292,10 @@
             this.show_sncode.Enabled = false;
             this.show_sncode.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.show_sncode.ID = null;
-            this.show_sncode.Location = new System.Drawing.Point(124, 572);
-            this.show_sncode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.show_sncode.Location = new System.Drawing.Point(83, 381);
             this.show_sncode.Name = "show_sncode";
             this.show_sncode.Power = null;
-            this.show_sncode.Size = new System.Drawing.Size(238, 34);
+            this.show_sncode.Size = new System.Drawing.Size(160, 25);
             this.show_sncode.Str = null;
             this.show_sncode.Str1 = null;
             this.show_sncode.Str2 = null;
@@ -285,10 +306,11 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(550, 26);
-            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ma_prodcode.Location = new System.Drawing.Point(367, 17);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(133, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
             this.ma_prodcode.TabIndex = 24;
             // 
             // pr_detail
@@ -296,11 +318,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(906, 26);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(164, 0);
+            this.pr_detail.Location = new System.Drawing.Point(604, 17);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(109, 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, 21);
             this.pr_detail.TabIndex = 23;
             // 
             // code
@@ -309,11 +331,11 @@
             this.code.BackColor = System.Drawing.Color.White;
             this.code.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.code.ID = null;
-            this.code.Location = new System.Drawing.Point(124, 622);
-            this.code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.code.Location = new System.Drawing.Point(83, 415);
+            this.code.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.code.Name = "code";
             this.code.Power = null;
-            this.code.Size = new System.Drawing.Size(238, 34);
+            this.code.Size = new System.Drawing.Size(160, 25);
             this.code.Str = null;
             this.code.Str1 = null;
             this.code.Str2 = null;
@@ -323,10 +345,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.OperateResult.Location = new System.Drawing.Point(35, 249);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.OperateResult.Location = new System.Drawing.Point(23, 166);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1153, 296);
+            this.OperateResult.Size = new System.Drawing.Size(770, 199);
             this.OperateResult.TabIndex = 19;
             this.OperateResult.Text = "";
             // 
@@ -336,11 +358,11 @@
             this.SNPre.BackColor = System.Drawing.Color.White;
             this.SNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.SNPre.ID = null;
-            this.SNPre.Location = new System.Drawing.Point(776, 166);
-            this.SNPre.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.SNPre.Location = new System.Drawing.Point(517, 111);
+            this.SNPre.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.SNPre.Name = "SNPre";
             this.SNPre.Power = null;
-            this.SNPre.Size = new System.Drawing.Size(213, 34);
+            this.SNPre.Size = new System.Drawing.Size(143, 25);
             this.SNPre.Str = null;
             this.SNPre.Str1 = null;
             this.SNPre.Str2 = null;
@@ -352,11 +374,11 @@
             this.TSNPre.BackColor = System.Drawing.Color.White;
             this.TSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.TSNPre.ID = null;
-            this.TSNPre.Location = new System.Drawing.Point(776, 118);
-            this.TSNPre.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.TSNPre.Location = new System.Drawing.Point(517, 79);
+            this.TSNPre.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.TSNPre.Name = "TSNPre";
             this.TSNPre.Power = null;
-            this.TSNPre.Size = new System.Drawing.Size(213, 34);
+            this.TSNPre.Size = new System.Drawing.Size(143, 25);
             this.TSNPre.Str = null;
             this.TSNPre.Str1 = null;
             this.TSNPre.Str2 = null;
@@ -368,12 +390,12 @@
             this.SNLength.BackColor = System.Drawing.Color.White;
             this.SNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.SNLength.ID = null;
-            this.SNLength.Location = new System.Drawing.Point(185, 165);
-            this.SNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.SNLength.Location = new System.Drawing.Point(123, 110);
+            this.SNLength.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.SNLength.Name = "SNLength";
             this.SNLength.Negative = false;
             this.SNLength.Power = null;
-            this.SNLength.Size = new System.Drawing.Size(213, 34);
+            this.SNLength.Size = new System.Drawing.Size(143, 25);
             this.SNLength.Str = null;
             this.SNLength.Str1 = null;
             this.SNLength.Str2 = null;
@@ -385,12 +407,12 @@
             this.TSNLength.BackColor = System.Drawing.Color.White;
             this.TSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.TSNLength.ID = null;
-            this.TSNLength.Location = new System.Drawing.Point(185, 119);
-            this.TSNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.TSNLength.Location = new System.Drawing.Point(123, 79);
+            this.TSNLength.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.TSNLength.Name = "TSNLength";
             this.TSNLength.Negative = false;
             this.TSNLength.Power = null;
-            this.TSNLength.Size = new System.Drawing.Size(213, 34);
+            this.TSNLength.Size = new System.Drawing.Size(143, 25);
             this.TSNLength.Str = null;
             this.TSNLength.Str1 = null;
             this.TSNLength.Str2 = null;
@@ -398,9 +420,10 @@
             // 
             // Make_SeqProgramTransform
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1274, 681);
+            this.ClientSize = new System.Drawing.Size(849, 454);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.ma_softversion);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.ChangeResult);
@@ -430,13 +453,13 @@
             this.Controls.Add(this.ma_prodcode_label);
             this.Controls.Add(this.ms_macode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.Name = "Make_SeqProgramTransform";
             this.Tag = "Make!SeqProgramTransform";
             this.Load += new System.EventHandler(this.Make_SeqProgramTransform_Load);
             this.SizeChanged += new System.EventHandler(this.Make_SeqProgramTransform_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -471,5 +494,6 @@
         private CustomControl.CustomCheckBox.CustomCheckBox ChangeResult;
         private System.Windows.Forms.Label ma_softversion;
         private System.Windows.Forms.Label label2;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
     }
 }

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -73,6 +73,11 @@ namespace UAS_MES.Make
             //提示用户“>>请输入TSN号”
             OperateResult.AppendText(">>请输入TSN号\n", Color.Black);
             dh = new DataHelper();
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
         
         private void code_KeyDown(object sender, KeyEventArgs e)

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

@@ -46,6 +46,7 @@
             this.sn_code_label = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.ma_softversion = new System.Windows.Forms.Label();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.ChangeResult = new UAS_MES.CustomControl.CustomCheckBox.CustomCheckBox();
             this.show_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -63,20 +64,18 @@
             // 
             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(22, 26);
-            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode_label.Location = new System.Drawing.Point(15, 17);
             this.ms_makecode_label.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(0, 31);
+            this.ms_makecode_label.Size = new System.Drawing.Size(0, 21);
             this.ms_makecode_label.TabIndex = 61;
             // 
             // pr_detail_label
             // 
             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(825, 22);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(550, 15);
             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(74, 21);
             this.pr_detail_label.TabIndex = 62;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -84,10 +83,9 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(460, 23);
-            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(307, 15);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(110, 31);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(74, 21);
             this.ma_prodcode_label.TabIndex = 63;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -95,10 +93,9 @@
             // 
             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(25, 647);
-            this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sncode_label.Location = new System.Drawing.Point(17, 431);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(86, 31);
+            this.sncode_label.Size = new System.Drawing.Size(58, 21);
             this.sncode_label.TabIndex = 68;
             this.sncode_label.Text = "录入框";
             // 
@@ -106,10 +103,10 @@
             // 
             this.beforeTransSNLength_checkBox.AutoSize = true;
             this.beforeTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(28, 121);
-            this.beforeTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(19, 81);
+            this.beforeTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.beforeTransSNLength_checkBox.Name = "beforeTransSNLength_checkBox";
-            this.beforeTransSNLength_checkBox.Size = new System.Drawing.Size(117, 31);
+            this.beforeTransSNLength_checkBox.Size = new System.Drawing.Size(83, 24);
             this.beforeTransSNLength_checkBox.TabIndex = 81;
             this.beforeTransSNLength_checkBox.Text = "TSN长度";
             this.beforeTransSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -118,10 +115,10 @@
             // 
             this.afterTransSNLength_checkBox.AutoSize = true;
             this.afterTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(28, 170);
-            this.afterTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(19, 113);
+            this.afterTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.afterTransSNLength_checkBox.Name = "afterTransSNLength_checkBox";
-            this.afterTransSNLength_checkBox.Size = new System.Drawing.Size(106, 31);
+            this.afterTransSNLength_checkBox.Size = new System.Drawing.Size(75, 24);
             this.afterTransSNLength_checkBox.TabIndex = 82;
             this.afterTransSNLength_checkBox.Text = "SN长度";
             this.afterTransSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -130,10 +127,10 @@
             // 
             this.beforeTransSNPre_checkBox.AutoSize = true;
             this.beforeTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(632, 121);
-            this.beforeTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(421, 81);
+            this.beforeTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.beforeTransSNPre_checkBox.Name = "beforeTransSNPre_checkBox";
-            this.beforeTransSNPre_checkBox.Size = new System.Drawing.Size(117, 31);
+            this.beforeTransSNPre_checkBox.Size = new System.Drawing.Size(83, 24);
             this.beforeTransSNPre_checkBox.TabIndex = 83;
             this.beforeTransSNPre_checkBox.Text = "TSN前缀";
             this.beforeTransSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -142,10 +139,10 @@
             // 
             this.afterTransSNPre_checkBox.AutoSize = true;
             this.afterTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(632, 171);
-            this.afterTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(421, 114);
+            this.afterTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.afterTransSNPre_checkBox.Name = "afterTransSNPre_checkBox";
-            this.afterTransSNPre_checkBox.Size = new System.Drawing.Size(106, 31);
+            this.afterTransSNPre_checkBox.Size = new System.Drawing.Size(75, 24);
             this.afterTransSNPre_checkBox.TabIndex = 84;
             this.afterTransSNPre_checkBox.Text = "SN前缀";
             this.afterTransSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -154,9 +151,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(22, 23);
+            this.label1.Location = new System.Drawing.Point(15, 15);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(110, 31);
+            this.label1.Size = new System.Drawing.Size(74, 21);
             this.label1.TabIndex = 93;
             this.label1.Text = "工单编号";
             // 
@@ -164,9 +162,10 @@
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_code.Location = new System.Drawing.Point(136, 22);
+            this.ma_code.Location = new System.Drawing.Point(91, 15);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 31);
+            this.ma_code.Size = new System.Drawing.Size(0, 21);
             this.ma_code.TabIndex = 95;
             this.ma_code.TextChanged += new System.EventHandler(this.ms_makecode_UserControlTextChanged);
             // 
@@ -174,38 +173,44 @@
             // 
             this.changenum.AutoSize = true;
             this.changenum.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.changenum.Location = new System.Drawing.Point(572, 77);
+            this.changenum.Location = new System.Drawing.Point(729, 427);
+            this.changenum.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.changenum.Name = "changenum";
-            this.changenum.Size = new System.Drawing.Size(28, 31);
+            this.changenum.Size = new System.Drawing.Size(19, 21);
             this.changenum.TabIndex = 100;
             this.changenum.Text = "0";
+            this.changenum.Visible = false;
             // 
             // remain_qty
             // 
             this.remain_qty.AutoSize = true;
             this.remain_qty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty.Location = new System.Drawing.Point(140, 76);
+            this.remain_qty.Location = new System.Drawing.Point(93, 51);
+            this.remain_qty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.remain_qty.Name = "remain_qty";
-            this.remain_qty.Size = new System.Drawing.Size(0, 31);
+            this.remain_qty.Size = new System.Drawing.Size(0, 21);
             this.remain_qty.TabIndex = 99;
             // 
             // PrintNum_label
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.PrintNum_label.Location = new System.Drawing.Point(460, 77);
+            this.PrintNum_label.Location = new System.Drawing.Point(655, 427);
+            this.PrintNum_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.PrintNum_label.Name = "PrintNum_label";
-            this.PrintNum_label.Size = new System.Drawing.Size(62, 31);
+            this.PrintNum_label.Size = new System.Drawing.Size(42, 21);
             this.PrintNum_label.TabIndex = 98;
             this.PrintNum_label.Text = "计数";
+            this.PrintNum_label.Visible = false;
             // 
             // remain_qty_label
             // 
             this.remain_qty_label.AutoSize = true;
             this.remain_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty_label.Location = new System.Drawing.Point(27, 77);
+            this.remain_qty_label.Location = new System.Drawing.Point(18, 51);
+            this.remain_qty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.remain_qty_label.Name = "remain_qty_label";
-            this.remain_qty_label.Size = new System.Drawing.Size(86, 31);
+            this.remain_qty_label.Size = new System.Drawing.Size(58, 21);
             this.remain_qty_label.TabIndex = 97;
             this.remain_qty_label.Text = "剩余数";
             // 
@@ -213,10 +218,9 @@
             // 
             this.ClearSn_code.Cursor = System.Windows.Forms.Cursors.Hand;
             this.ClearSn_code.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
-            this.ClearSn_code.Location = new System.Drawing.Point(420, 598);
-            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ClearSn_code.Location = new System.Drawing.Point(280, 399);
             this.ClearSn_code.Name = "ClearSn_code";
-            this.ClearSn_code.Size = new System.Drawing.Size(24, 24);
+            this.ClearSn_code.Size = new System.Drawing.Size(16, 16);
             this.ClearSn_code.TabIndex = 141;
             this.ClearSn_code.TabStop = false;
             this.ClearSn_code.Click += new System.EventHandler(this.ReCall_Click);
@@ -225,10 +229,9 @@
             // 
             this.sn_code_label.AutoSize = true;
             this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_label.Location = new System.Drawing.Point(25, 594);
-            this.sn_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sn_code_label.Location = new System.Drawing.Point(17, 396);
             this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(86, 31);
+            this.sn_code_label.Size = new System.Drawing.Size(58, 21);
             this.sn_code_label.TabIndex = 139;
             this.sn_code_label.Text = "序列号";
             // 
@@ -236,10 +239,9 @@
             // 
             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(825, 76);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Location = new System.Drawing.Point(550, 51);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(110, 31);
+            this.label2.Size = new System.Drawing.Size(74, 21);
             this.label2.TabIndex = 147;
             this.label2.Text = "软件版本";
             // 
@@ -247,20 +249,32 @@
             // 
             this.ma_softversion.AutoSize = true;
             this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_softversion.Location = new System.Drawing.Point(935, 76);
+            this.ma_softversion.Location = new System.Drawing.Point(623, 51);
+            this.ma_softversion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 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, 21);
             this.ma_softversion.TabIndex = 148;
             // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(307, 51);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(88, 22);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 196;
+            // 
             // ChangeResult
             // 
             this.ChangeResult.AutoSize = true;
             this.ChangeResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ChangeResult.Location = new System.Drawing.Point(420, 641);
-            this.ChangeResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.ChangeResult.Location = new System.Drawing.Point(280, 427);
+            this.ChangeResult.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.ChangeResult.Name = "ChangeResult";
             this.ChangeResult.Power = "ifspecial";
-            this.ChangeResult.Size = new System.Drawing.Size(136, 35);
+            this.ChangeResult.Size = new System.Drawing.Size(93, 25);
             this.ChangeResult.TabIndex = 146;
             this.ChangeResult.Text = "重新转换";
             this.ChangeResult.UseVisualStyleBackColor = true;
@@ -273,11 +287,10 @@
             this.show_sncode.Enabled = false;
             this.show_sncode.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.show_sncode.ID = null;
-            this.show_sncode.Location = new System.Drawing.Point(145, 594);
-            this.show_sncode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.show_sncode.Location = new System.Drawing.Point(97, 396);
             this.show_sncode.Name = "show_sncode";
             this.show_sncode.Power = null;
-            this.show_sncode.Size = new System.Drawing.Size(238, 34);
+            this.show_sncode.Size = new System.Drawing.Size(160, 25);
             this.show_sncode.Str = null;
             this.show_sncode.Str1 = null;
             this.show_sncode.Str2 = null;
@@ -288,10 +301,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail.Location = new System.Drawing.Point(935, 22);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 0);
+            this.pr_detail.Location = new System.Drawing.Point(623, 15);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(133, 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, 21);
             this.pr_detail.TabIndex = 96;
             // 
             // ma_prodcode
@@ -299,29 +313,30 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_prodcode.Location = new System.Drawing.Point(576, 26);
-            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.ma_prodcode.Location = new System.Drawing.Point(384, 17);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(1, 0, 1, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(133, 0);
             this.ma_prodcode.Name = "ma_prodcode";
-            this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
+            this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
             this.ma_prodcode.TabIndex = 94;
             // 
             // afterTransSNLength
             // 
             this.afterTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength.Location = new System.Drawing.Point(166, 172);
-            this.afterTransSNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.afterTransSNLength.Location = new System.Drawing.Point(111, 115);
+            this.afterTransSNLength.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.afterTransSNLength.Name = "afterTransSNLength";
-            this.afterTransSNLength.Size = new System.Drawing.Size(250, 34);
+            this.afterTransSNLength.Size = new System.Drawing.Size(168, 25);
             this.afterTransSNLength.TabIndex = 90;
             this.afterTransSNLength.Text = "0";
             // 
             // beforeTransSNLength
             // 
             this.beforeTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNLength.Location = new System.Drawing.Point(166, 121);
-            this.beforeTransSNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.beforeTransSNLength.Location = new System.Drawing.Point(111, 81);
+            this.beforeTransSNLength.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.beforeTransSNLength.Name = "beforeTransSNLength";
-            this.beforeTransSNLength.Size = new System.Drawing.Size(250, 34);
+            this.beforeTransSNLength.Size = new System.Drawing.Size(168, 25);
             this.beforeTransSNLength.TabIndex = 89;
             this.beforeTransSNLength.Text = "0";
             // 
@@ -331,11 +346,11 @@
             this.afterTransSNPre.BackColor = System.Drawing.Color.White;
             this.afterTransSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.afterTransSNPre.ID = null;
-            this.afterTransSNPre.Location = new System.Drawing.Point(769, 169);
-            this.afterTransSNPre.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.afterTransSNPre.Location = new System.Drawing.Point(513, 113);
+            this.afterTransSNPre.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.afterTransSNPre.Name = "afterTransSNPre";
             this.afterTransSNPre.Power = null;
-            this.afterTransSNPre.Size = new System.Drawing.Size(250, 34);
+            this.afterTransSNPre.Size = new System.Drawing.Size(168, 25);
             this.afterTransSNPre.Str = null;
             this.afterTransSNPre.Str1 = null;
             this.afterTransSNPre.Str2 = null;
@@ -347,11 +362,11 @@
             this.beforeTransSNPre.BackColor = System.Drawing.Color.White;
             this.beforeTransSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.beforeTransSNPre.ID = null;
-            this.beforeTransSNPre.Location = new System.Drawing.Point(769, 119);
-            this.beforeTransSNPre.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.beforeTransSNPre.Location = new System.Drawing.Point(513, 79);
+            this.beforeTransSNPre.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.beforeTransSNPre.Name = "beforeTransSNPre";
             this.beforeTransSNPre.Power = null;
-            this.beforeTransSNPre.Size = new System.Drawing.Size(250, 34);
+            this.beforeTransSNPre.Size = new System.Drawing.Size(168, 25);
             this.beforeTransSNPre.Str = null;
             this.beforeTransSNPre.Str1 = null;
             this.beforeTransSNPre.Str2 = null;
@@ -360,10 +375,9 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.OperateResult.Location = new System.Drawing.Point(28, 220);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(19, 147);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1216, 344);
+            this.OperateResult.Size = new System.Drawing.Size(812, 231);
             this.OperateResult.TabIndex = 78;
             this.OperateResult.Text = "";
             // 
@@ -373,11 +387,10 @@
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(145, 644);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.sncode.Location = new System.Drawing.Point(97, 429);
             this.sncode.Name = "sncode";
             this.sncode.Power = "ifread";
-            this.sncode.Size = new System.Drawing.Size(238, 34);
+            this.sncode.Size = new System.Drawing.Size(160, 25);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -387,9 +400,10 @@
             // 
             // Make_SeqTransform
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1274, 701);
+            this.ClientSize = new System.Drawing.Size(849, 467);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.ma_softversion);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.ChangeResult);
@@ -419,14 +433,13 @@
             this.Controls.Add(this.pr_detail_label);
             this.Controls.Add(this.ma_prodcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_SeqTransform";
             this.Tag = "Make!SeqTransform";
             this.Text = " ";
             this.Load += new System.EventHandler(this.Make_SeqTransform_Load);
             this.SizeChanged += new System.EventHandler(this.Make_SeqTransform_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -460,5 +473,6 @@
         private CustomControl.CustomCheckBox.CustomCheckBox ChangeResult;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label ma_softversion;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
     }
 }

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -448,6 +448,11 @@ namespace UAS_MES.Make
             dh = new DataHelper();
             sncode.Focus();
             OperateResult.AppendText(">>请输入TSN号\n", Color.Black);
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
 
         private void Make_SeqTransform_SizeChanged(object sender, EventArgs e)

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

@@ -64,6 +64,8 @@
             this.pr_code = new System.Windows.Forms.Label();
             this.AutoGenBoxCode = new System.Windows.Forms.CheckBox();
             this.groupBoxWithBorder2 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.label1 = new System.Windows.Forms.Label();
+            this.ob_checkno = new System.Windows.Forms.Label();
             this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_nowcheckqty = new System.Windows.Forms.Label();
             this.ob_batchqty = new System.Windows.Forms.Label();
@@ -89,8 +91,7 @@
             this.pa_makecode = new System.Windows.Forms.Label();
             this.pr_sendchecktype = new System.Windows.Forms.Label();
             this.ms_salecode = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.ob_checkno = new System.Windows.Forms.Label();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
             this.groupBoxWithBorder2.SuspendLayout();
@@ -122,7 +123,7 @@
             // 
             this.pa_code_label.AutoSize = true;
             this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_code_label.Location = new System.Drawing.Point(8, 38);
+            this.pa_code_label.Location = new System.Drawing.Point(7, 37);
             this.pa_code_label.Name = "pa_code_label";
             this.pa_code_label.Size = new System.Drawing.Size(42, 21);
             this.pa_code_label.TabIndex = 113;
@@ -132,7 +133,7 @@
             // 
             this.PrintList_label.AutoSize = true;
             this.PrintList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintList_label.Location = new System.Drawing.Point(9, 41);
+            this.PrintList_label.Location = new System.Drawing.Point(8, 40);
             this.PrintList_label.Name = "PrintList_label";
             this.PrintList_label.Size = new System.Drawing.Size(90, 21);
             this.PrintList_label.TabIndex = 116;
@@ -142,7 +143,7 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintNum_label.Location = new System.Drawing.Point(183, 123);
+            this.PrintNum_label.Location = new System.Drawing.Point(182, 122);
             this.PrintNum_label.Name = "PrintNum_label";
             this.PrintNum_label.Size = new System.Drawing.Size(42, 21);
             this.PrintNum_label.TabIndex = 124;
@@ -185,7 +186,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(9, 80);
+            this.label3.Location = new System.Drawing.Point(8, 79);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(74, 21);
             this.label3.TabIndex = 160;
@@ -222,7 +223,7 @@
             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(4, 419);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(447, 120);
+            this.OperateResult.Size = new System.Drawing.Size(447, 107);
             this.OperateResult.TabIndex = 155;
             this.OperateResult.Text = "";
             // 
@@ -253,7 +254,7 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = null;
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(464, 514);
+            this.Clean.Location = new System.Drawing.Point(458, 502);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
@@ -428,7 +429,7 @@
             // 
             this.pa_currentqty_label.AutoSize = true;
             this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty_label.Location = new System.Drawing.Point(207, 74);
+            this.pa_currentqty_label.Location = new System.Drawing.Point(206, 73);
             this.pa_currentqty_label.Name = "pa_currentqty_label";
             this.pa_currentqty_label.Size = new System.Drawing.Size(74, 21);
             this.pa_currentqty_label.TabIndex = 175;
@@ -438,7 +439,7 @@
             // 
             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(207, 112);
+            this.pr_detail_label.Location = new System.Drawing.Point(206, 111);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
             this.pr_detail_label.TabIndex = 173;
@@ -448,7 +449,7 @@
             // 
             this.pa_currentqty.AutoSize = true;
             this.pa_currentqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty.Location = new System.Drawing.Point(290, 74);
+            this.pa_currentqty.Location = new System.Drawing.Point(289, 73);
             this.pa_currentqty.Name = "pa_currentqty";
             this.pa_currentqty.Size = new System.Drawing.Size(0, 21);
             this.pa_currentqty.TabIndex = 179;
@@ -457,7 +458,7 @@
             // 
             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(8, 112);
+            this.pr_code_label.Location = new System.Drawing.Point(7, 111);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(74, 21);
             this.pr_code_label.TabIndex = 174;
@@ -467,7 +468,7 @@
             // 
             this.pr_detail.AutoSize = true;
             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(290, 112);
+            this.pr_detail.Location = new System.Drawing.Point(289, 111);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 21);
             this.pr_detail.TabIndex = 178;
@@ -476,7 +477,7 @@
             // 
             this.pr_outboxinnerqty_label.AutoSize = true;
             this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(8, 74);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(7, 73);
             this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
             this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(74, 21);
             this.pr_outboxinnerqty_label.TabIndex = 176;
@@ -486,7 +487,7 @@
             // 
             this.pr_code.AutoSize = true;
             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(96, 112);
+            this.pr_code.Location = new System.Drawing.Point(95, 111);
             this.pr_code.MaximumSize = new System.Drawing.Size(150, 0);
             this.pr_code.Name = "pr_code";
             this.pr_code.Size = new System.Drawing.Size(0, 21);
@@ -496,7 +497,7 @@
             // AutoGenBoxCode
             // 
             this.AutoGenBoxCode.AutoSize = true;
-            this.AutoGenBoxCode.Location = new System.Drawing.Point(211, 38);
+            this.AutoGenBoxCode.Location = new System.Drawing.Point(210, 37);
             this.AutoGenBoxCode.Margin = new System.Windows.Forms.Padding(2);
             this.AutoGenBoxCode.Name = "AutoGenBoxCode";
             this.AutoGenBoxCode.Size = new System.Drawing.Size(93, 25);
@@ -534,6 +535,25 @@
             this.groupBoxWithBorder2.Text = "打印";
             this.groupBoxWithBorder2.TextColor = System.Drawing.Color.Black;
             // 
+            // label1
+            // 
+            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(273, 17);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.TabIndex = 184;
+            this.label1.Text = "当前批号";
+            // 
+            // ob_checkno
+            // 
+            this.ob_checkno.AutoSize = true;
+            this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ob_checkno.Location = new System.Drawing.Point(354, 17);
+            this.ob_checkno.Name = "ob_checkno";
+            this.ob_checkno.Size = new System.Drawing.Size(0, 21);
+            this.ob_checkno.TabIndex = 183;
+            // 
             // PrintNum
             // 
             this.PrintNum.AllPower = null;
@@ -554,7 +574,7 @@
             // 
             this.ob_nowcheckqty.AutoSize = true;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(355, 80);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(354, 79);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 21);
             this.ob_nowcheckqty.TabIndex = 178;
@@ -563,7 +583,7 @@
             // 
             this.ob_batchqty.AutoSize = true;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty.Location = new System.Drawing.Point(355, 41);
+            this.ob_batchqty.Location = new System.Drawing.Point(354, 40);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Size = new System.Drawing.Size(0, 21);
             this.ob_batchqty.TabIndex = 177;
@@ -572,7 +592,7 @@
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(274, 80);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(273, 79);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
             this.ob_nowcheckqty_label.Size = new System.Drawing.Size(74, 21);
             this.ob_nowcheckqty_label.TabIndex = 176;
@@ -582,7 +602,7 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(274, 41);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(273, 40);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
             this.ob_batchqty_label.Size = new System.Drawing.Size(74, 21);
             this.ob_batchqty_label.TabIndex = 175;
@@ -671,7 +691,7 @@
             // 
             this.pr_cartonunit1.AutoSize = true;
             this.pr_cartonunit1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartonunit1.Location = new System.Drawing.Point(93, 132);
+            this.pr_cartonunit1.Location = new System.Drawing.Point(92, 131);
             this.pr_cartonunit1.Name = "pr_cartonunit1";
             this.pr_cartonunit1.Size = new System.Drawing.Size(20, 21);
             this.pr_cartonunit1.TabIndex = 184;
@@ -683,7 +703,7 @@
             // 
             this.pr_cartonunit.AutoSize = true;
             this.pr_cartonunit.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartonunit.Location = new System.Drawing.Point(62, 31);
+            this.pr_cartonunit.Location = new System.Drawing.Point(61, 30);
             this.pr_cartonunit.Name = "pr_cartonunit";
             this.pr_cartonunit.Size = new System.Drawing.Size(20, 21);
             this.pr_cartonunit.TabIndex = 183;
@@ -694,7 +714,7 @@
             // 
             this.pr_cartonboxgw.AutoSize = true;
             this.pr_cartonboxgw.Font = new System.Drawing.Font("微软雅黑", 35F);
-            this.pr_cartonboxgw.Location = new System.Drawing.Point(36, 168);
+            this.pr_cartonboxgw.Location = new System.Drawing.Point(35, 167);
             this.pr_cartonboxgw.Name = "pr_cartonboxgw";
             this.pr_cartonboxgw.Size = new System.Drawing.Size(0, 60);
             this.pr_cartonboxgw.TabIndex = 182;
@@ -703,7 +723,7 @@
             // 
             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(20, 132);
+            this.label4.Location = new System.Drawing.Point(19, 131);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(74, 21);
             this.label4.TabIndex = 181;
@@ -714,7 +734,7 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 35F);
             this.weight.ForeColor = System.Drawing.Color.Green;
-            this.weight.Location = new System.Drawing.Point(36, 62);
+            this.weight.Location = new System.Drawing.Point(35, 61);
             this.weight.Name = "weight";
             this.weight.Size = new System.Drawing.Size(0, 60);
             this.weight.TabIndex = 180;
@@ -723,7 +743,7 @@
             // 
             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(20, 31);
+            this.label2.Location = new System.Drawing.Point(19, 30);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(42, 21);
             this.label2.TabIndex = 179;
@@ -817,30 +837,23 @@
             this.ms_salecode.TabIndex = 185;
             this.ms_salecode.Visible = false;
             // 
-            // label1
-            // 
-            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(274, 18);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
-            this.label1.TabIndex = 184;
-            this.label1.Text = "当前批号";
-            // 
-            // ob_checkno
+            // StepCount
             // 
-            this.ob_checkno.AutoSize = true;
-            this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno.Location = new System.Drawing.Point(355, 18);
-            this.ob_checkno.Name = "ob_checkno";
-            this.ob_checkno.Size = new System.Drawing.Size(0, 21);
-            this.ob_checkno.TabIndex = 183;
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(458, 541);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(88, 22);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 186;
             // 
             // Make_SpecialCartonPack
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(879, 582);
+            this.Controls.Add(this.StepCount);
             this.Controls.Add(this.ms_salecode);
             this.Controls.Add(this.pr_sendchecktype);
             this.Controls.Add(this.pa_makecode);
@@ -947,5 +960,6 @@
         private System.Windows.Forms.Label ms_salecode;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label ob_checkno;
+        private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
     }
 }

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -95,6 +95,11 @@ namespace UAS_MES.Make
                 else
                     OperateResult.AppendText(">>" + mes.Message + "\n", Color.Red);
             }
+            StepCount.StepCode = User.CurrentStepCode;
+            StepCount.Source = User.UserSourceCode;
+            StepCount.LineCode = User.UserLineCode;
+            StepCount.Dh = dh;
+            StepCount.Start();
         }
 
 

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.resx

@@ -212,24 +212,6 @@
   <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="pd_barcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_outboxcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_prodcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_innerqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_indate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="DeleteAll.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m