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

UAS-MES/FunctionCode/Employee/Employee_ChooseUserToGroup.Designer.cs

@@ -46,10 +46,6 @@
             this.ScreenOutGroup = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ScreenInGroup = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OutGroupUser = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
-            this.em_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.em_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.em_depart = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.em_position = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.UserOut = new UAS_MES.CustomControl.ButtonUtil.ArrowRightButton();
             this.UserIn = new UAS_MES.CustomControl.ButtonUtil.ArrowLeftButton();
             this.InGroupUser = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
@@ -58,6 +54,11 @@
             this.em_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.em_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.em_recorder = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.em_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.em_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.em_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.em_depart = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.em_position = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.OutGroupUser)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.InGroupUser)).BeginInit();
             this.SuspendLayout();
@@ -288,6 +289,7 @@
             this.OutGroupUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.OutGroupUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.em_code1,
+            this.em_id,
             this.em_name1,
             this.em_depart,
             this.em_position});
@@ -298,36 +300,6 @@
             this.OutGroupUser.Size = new System.Drawing.Size(500, 555);
             this.OutGroupUser.TabIndex = 243;
             // 
-            // em_code1
-            // 
-            this.em_code1.DataPropertyName = "em_code";
-            this.em_code1.HeaderText = "用户编号";
-            this.em_code1.Name = "em_code1";
-            this.em_code1.ReadOnly = true;
-            this.em_code1.Width = 96;
-            // 
-            // em_name1
-            // 
-            this.em_name1.DataPropertyName = "em_name";
-            this.em_name1.HeaderText = "用户名称";
-            this.em_name1.Name = "em_name1";
-            this.em_name1.ReadOnly = true;
-            // 
-            // em_depart
-            // 
-            this.em_depart.DataPropertyName = "em_depart";
-            this.em_depart.HeaderText = "部门";
-            this.em_depart.Name = "em_depart";
-            this.em_depart.ReadOnly = true;
-            this.em_depart.Width = 66;
-            // 
-            // em_position
-            // 
-            this.em_position.DataPropertyName = "em_position";
-            this.em_position.HeaderText = "岗位";
-            this.em_position.Name = "em_position";
-            this.em_position.ReadOnly = true;
-            // 
             // UserOut
             // 
             this.UserOut.Image = ((System.Drawing.Image)(resources.GetObject("UserOut.Image")));
@@ -406,6 +378,43 @@
             this.em_recorder.ReadOnly = true;
             this.em_recorder.Width = 81;
             // 
+            // em_code1
+            // 
+            this.em_code1.DataPropertyName = "em_code";
+            this.em_code1.HeaderText = "用户编号";
+            this.em_code1.Name = "em_code1";
+            this.em_code1.ReadOnly = true;
+            this.em_code1.Width = 96;
+            // 
+            // em_id
+            // 
+            this.em_id.DataPropertyName = "em_id";
+            this.em_id.HeaderText = "em_id";
+            this.em_id.Name = "em_id";
+            this.em_id.Visible = false;
+            // 
+            // em_name1
+            // 
+            this.em_name1.DataPropertyName = "em_name";
+            this.em_name1.HeaderText = "用户名称";
+            this.em_name1.Name = "em_name1";
+            this.em_name1.ReadOnly = true;
+            // 
+            // em_depart
+            // 
+            this.em_depart.DataPropertyName = "em_depart";
+            this.em_depart.HeaderText = "部门";
+            this.em_depart.Name = "em_depart";
+            this.em_depart.ReadOnly = true;
+            this.em_depart.Width = 66;
+            // 
+            // em_position
+            // 
+            this.em_position.DataPropertyName = "em_position";
+            this.em_position.HeaderText = "岗位";
+            this.em_position.Name = "em_position";
+            this.em_position.ReadOnly = true;
+            // 
             // Employee_ChooseUserToGroup
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -465,10 +474,6 @@
         private CustomControl.TextBoxWithIcon.EnterTextBox em_name2;
         private CustomControl.TextBoxWithIcon.EnterTextBox em_name3;
         private System.Windows.Forms.Label ug_name_title_label;
-        private System.Windows.Forms.DataGridViewTextBoxColumn em_code1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn em_name1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn em_depart;
-        private System.Windows.Forms.DataGridViewTextBoxColumn em_position;
         private System.Windows.Forms.DataGridViewTextBoxColumn em_code;
         private System.Windows.Forms.DataGridViewTextBoxColumn eg_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn em_name;
@@ -476,5 +481,10 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn em_recorder;
         private CustomControl.TextBoxWithIcon.SearchTextBox em_code3;
         private CustomControl.TextBoxWithIcon.SearchTextBox em_code2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn em_code1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn em_id;
+        private System.Windows.Forms.DataGridViewTextBoxColumn em_name1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn em_depart;
+        private System.Windows.Forms.DataGridViewTextBoxColumn em_position;
     }
 }

UAS-MES/FunctionCode/Employee/Employee_ChooseUserToGroup.cs

@@ -96,9 +96,10 @@ namespace UAS_MES.Employee
                 string ConfirmAdd = MessageBox.Show(this.ParentForm, "确认添加所选人员到分组？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                 if (ConfirmAdd == "Yes")
                 {
+                    string ug_id = dh.getFieldDataByCondition("CS$USERGROUP", "ug_id", "ug_code='"+ ug_code_title.Text + "'").ToString();
                     sql.Clear();
-                    sql.Append("insert into cs$empgroup (eg_id,eg_emcode,eg_groupcode,eg_name)");
-                    sql.Append("values (cs$empgroup_seq.nextval,:em_code,'" + ug_code_title.Text + "','" + em_name3.Text + "')");
+                    sql.Append("insert into cs$empgroup (eg_id,eg_emcode,eg_groupcode,eg_name,eg_groupid)");
+                    sql.Append("values (cs$empgroup_seq.nextval,:em_code,'" + ug_code_title.Text + "','" + em_name3.Text + "','"+ ug_id + "')");
                     dh.BatchInsert(sql.GetString(), new string[] { "em_code", }, MoveInUserCode.ToArray());
                     ScreenInGroup.PerformClick();
                     ScreenOutGroup.PerformClick();
@@ -154,7 +155,7 @@ namespace UAS_MES.Employee
         private void ScreenOutGroup_Click(object sender, EventArgs e)
         {
             sql.Clear();
-            sql.Append("select distinct em_code,em_name,em_position,em_depart from employee left join ");
+            sql.Append("select distinct em_code,em_name,em_position,em_depart,em_id from employee left join ");
             sql.Append("cs$empgroup on eg_emcode=em_code and eg_groupcode='" + ug_code_title.Text + "'");
             if (ug_code_title.Text != "" || ug_name_title.Text != "")
             {

UAS-MES/FunctionCode/Employee/Employee_ChooseUserToGroup.resx

@@ -197,6 +197,9 @@
   <metadata name="em_code1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="em_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="em_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

UAS-MES/FunctionCode/Employee/Employee_Group.cs

@@ -25,6 +25,7 @@ namespace UAS_MES.Employee
 
         private void 人员分组_Load(object sender, EventArgs e)
         {
+            asc.controllInitializeSize(this);
             dh = new DataHelper();
             //手动加入第一列全选列
             DataGridViewCheckBoxColumn dgvc = new DataGridViewCheckBoxColumn();
@@ -47,7 +48,6 @@ namespace UAS_MES.Employee
 
             ug_code1.KeyDown += KeyDownEvent;
             ug_name1.KeyDown += KeyDownEvent;
-            asc.controllInitializeSize(this);
         }
 
         private void 人员分组_SizeChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/Employee/Employee_Power.cs

@@ -46,6 +46,7 @@ namespace UAS_MES.Employee
         private void 权限控制_Load(object sender, EventArgs e)
         {
             //不检测进程
+            asc.controllInitializeSize(this);
             CheckForIllegalCrossThreadCalls = false;
             //界面加载时设置保存按钮不可见
             if (ug_code.Text == "")
@@ -81,7 +82,7 @@ namespace UAS_MES.Employee
             //如果页面加载的时候通过传参的构造函数
             if (ug_code.Text != "")
                 Screen.PerformClick();
-            asc.controllInitializeSize(this);
+          
         }
 
         private void Screen_Click(object sender, EventArgs e)

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

@@ -54,20 +54,20 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1052, 85);
+            this.PrintLabel.Location = new System.Drawing.Point(1164, 102);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(169, 23);
+            this.PrintLabel.Size = new System.Drawing.Size(190, 26);
             this.PrintLabel.TabIndex = 181;
             // 
             // 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(949, 22);
+            this.label2.Location = new System.Drawing.Point(1068, 26);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(72, 27);
+            this.label2.Size = new System.Drawing.Size(86, 31);
             this.label2.TabIndex = 180;
             this.label2.Text = "打印机";
             // 
@@ -75,10 +75,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(949, 85);
+            this.label1.Location = new System.Drawing.Point(1068, 102);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(52, 27);
+            this.label1.Size = new System.Drawing.Size(62, 31);
             this.label1.TabIndex = 179;
             this.label1.Text = "标签";
             // 
@@ -86,10 +86,10 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(600, 24);
+            this.pr_detail_label.Location = new System.Drawing.Point(675, 29);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             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(110, 31);
             this.pr_detail_label.TabIndex = 171;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -99,10 +99,10 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode_label.AutoSize = true;
             this.sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sncode_label.Location = new System.Drawing.Point(16, 533);
+            this.sncode_label.Location = new System.Drawing.Point(18, 623);
             this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(72, 27);
+            this.sncode_label.Size = new System.Drawing.Size(86, 31);
             this.sncode_label.TabIndex = 170;
             this.sncode_label.Text = "序列号";
             // 
@@ -110,10 +110,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(600, 85);
+            this.label4.Location = new System.Drawing.Point(675, 102);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(92, 27);
+            this.label4.Size = new System.Drawing.Size(110, 31);
             this.label4.TabIndex = 167;
             this.label4.Text = "打印张数";
             // 
@@ -121,10 +121,10 @@
             // 
             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.Location = new System.Drawing.Point(346, 102);
             this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             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(86, 31);
             this.mcd_remainqty_label.TabIndex = 166;
             this.mcd_remainqty_label.Text = "剩余数";
             // 
@@ -132,10 +132,10 @@
             // 
             this.mcd_okqty_label.AutoSize = true;
             this.mcd_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_okqty_label.Location = new System.Drawing.Point(16, 85);
+            this.mcd_okqty_label.Location = new System.Drawing.Point(18, 102);
             this.mcd_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             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(110, 31);
             this.mcd_okqty_label.TabIndex = 165;
             this.mcd_okqty_label.Text = "打印计数";
             // 
@@ -143,10 +143,10 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(308, 24);
+            this.pr_code_label.Location = new System.Drawing.Point(346, 29);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             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(110, 31);
             this.pr_code_label.TabIndex = 164;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -154,10 +154,10 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(16, 24);
+            this.ms_makecode_label.Location = new System.Drawing.Point(18, 29);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             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(110, 31);
             this.ms_makecode_label.TabIndex = 163;
             this.ms_makecode_label.Text = "归属工单";
             // 
@@ -165,27 +165,27 @@
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_code.Location = new System.Drawing.Point(130, 24);
+            this.ma_code.Location = new System.Drawing.Point(128, 32);
             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, 31);
             this.ma_code.TabIndex = 182;
             // 
             // Printer
             // 
-            this.Printer.Location = new System.Drawing.Point(1052, 22);
-            this.Printer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Printer.Location = new System.Drawing.Point(1164, 26);
+            this.Printer.Margin = new System.Windows.Forms.Padding(6);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(169, 31);
+            this.Printer.Size = new System.Drawing.Size(190, 37);
             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(435, 85);
+            this.mcd_remainqty.Location = new System.Drawing.Point(440, 99);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(24, 27);
+            this.mcd_remainqty.Size = new System.Drawing.Size(28, 31);
             this.mcd_remainqty.TabIndex = 177;
             this.mcd_remainqty.Text = "0";
             // 
@@ -193,10 +193,10 @@
             // 
             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(130, 85);
+            this.mcd_okqty.Location = new System.Drawing.Point(128, 102);
             this.mcd_okqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_okqty.Name = "mcd_okqty";
-            this.mcd_okqty.Size = new System.Drawing.Size(24, 27);
+            this.mcd_okqty.Size = new System.Drawing.Size(28, 31);
             this.mcd_okqty.TabIndex = 176;
             this.mcd_okqty.Text = "0";
             // 
@@ -204,10 +204,10 @@
             // 
             this.ma_prodcode.AutoSize = true;
             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(435, 24);
+            this.ma_prodcode.Location = new System.Drawing.Point(456, 32);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 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, 31);
             this.ma_prodcode.TabIndex = 175;
             this.ma_prodcode.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
             // 
@@ -215,10 +215,10 @@
             // 
             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(729, 24);
+            this.pr_detail.Location = new System.Drawing.Point(793, 32);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 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, 31);
             this.pr_detail.TabIndex = 174;
             // 
             // PrintNum
@@ -227,12 +227,12 @@
             this.PrintNum.BackColor = System.Drawing.Color.White;
             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(727, 85);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PrintNum.Location = new System.Drawing.Point(793, 99);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             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(224, 31);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -246,11 +246,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(135, 534);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sncode.Location = new System.Drawing.Point(143, 623);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;
-            this.sncode.Size = new System.Drawing.Size(260, 25);
+            this.sncode.Size = new System.Drawing.Size(292, 28);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -261,19 +261,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, 4, 4, 4);
+            this.OperateResult.Location = new System.Drawing.Point(24, 162);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(940, 380);
+            this.OperateResult.Size = new System.Drawing.Size(1057, 436);
             this.OperateResult.TabIndex = 168;
             this.OperateResult.Text = "";
             // 
             // Make_FuselageLabelPrint
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.AutoSize = true;
-            this.ClientSize = new System.Drawing.Size(1240, 580);
+            this.ClientSize = new System.Drawing.Size(1378, 672);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.PrintLabel);
             this.Controls.Add(this.label2);
@@ -294,7 +293,7 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Name = "Make_FuselageLabelPrint";
             this.Tag = "Make!FuselageLabelPrint";
             this.Text = "Make_FuselageLabelPrint";

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -101,40 +101,30 @@ namespace UAS_MES.Make
                         //所选标签不为空
                         if (PrintLabel.SelectedValue != null)
                         {
-                            //判断打印数量是否合理
-                            //合理
-                            if (int.Parse(PrintNum.Text) <= int.Parse(mcd_remainqty.Text) && int.Parse(PrintNum.Text) > 0)
-                            {
-                                //按照打印张数打印
-                                Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text));
-                                //提示用户打印成功
-                                OperateResult.AppendText(">>打印成功\n", Color.Green);
-                                //更新打印的数据
-                                LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "机身标打印", User.UserSourceCode, User.UserName, "机身标打印成功", out oErrorMessage);
-                                //清空输入框的值，聚焦
-                                sncode.Text = "";
-                                sncode.Focus();
-                                //刷新打印数量和剩余数量
-                                mcd_remainqty.Text = int.Parse(mcd_remainqty.Text) - 1 + "";
-                                mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
+                            //按照打印张数打印
+                            Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text));
+                            //提示用户打印成功
+                            OperateResult.AppendText(">>打印成功\n", Color.Green);
+                            //更新打印的数据
+                            LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "机身标打印", User.UserSourceCode, User.UserName, "机身标打印成功", out oErrorMessage);
+                            //清空输入框的值，聚焦
+                            sncode.Text = "";
+                            sncode.Focus();
+                            //刷新打印数量和剩余数量
+                            mcd_remainqty.Text = int.Parse(mcd_remainqty.Text) - 1 + "";
+                            mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
 
-                                //IF 剩余数=0，则清空form中的数据， 提示用户“工单：xx已经打印完成,>>请输入SN”, 清空mapB,listC 中的数据
-                                if (int.Parse(mcd_remainqty.Text) == 0)
-                                {
-                                    BaseUtil.CleanForm(this);
-                                    OperateResult.AppendText(">>工单：" + ma_code.Text + "打印完成，>>请输入SN\n", Color.Green);
-                                }
-                                //剩余数量不为0
-                                else
-                                {
-                                    //提示用户“>>请输入SN”
-                                    OperateResult.AppendText(">>请输入SN\n", Color.Green);
-                                }
+                            //IF 剩余数=0，则清空form中的数据， 提示用户“工单：xx已经打印完成,>>请输入SN”, 清空mapB,listC 中的数据
+                            if (int.Parse(mcd_remainqty.Text) == 0)
+                            {
+                                BaseUtil.CleanForm(this);
+                                OperateResult.AppendText(">>工单：" + ma_code.Text + "打印完成，>>请输入SN\n", Color.Green);
                             }
-                            //打印数量不合理
+                            //剩余数量不为0
                             else
                             {
-                                OperateResult.AppendText(">>打印数量不合理\n", Color.Red);
+                                //提示用户“>>请输入SN”
+                                OperateResult.AppendText(">>请输入SN\n", Color.Green);
                             }
                         }
                         //标签为空

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

@@ -1,4 +1,4 @@
-namespace UAS_MES.FunctionCode.Make
+namespace UAS_MES.Make
 {
     partial class Make_SeqProgramTransform
     {
@@ -43,22 +43,22 @@
             this.SNLength_checkBox = new System.Windows.Forms.CheckBox();
             this.TSNPre_checkBox = new System.Windows.Forms.CheckBox();
             this.SNPre_checkBox = new System.Windows.Forms.CheckBox();
-            this.TSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.SNLength = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.TSNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.SNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.tip = new System.Windows.Forms.Label();
-            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.cancel = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.in_label = new System.Windows.Forms.Label();
             this.code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.cancel = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.SNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.TSNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.SNLength = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.TSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.SuspendLayout();
             // 
             // ms_macode_label
             // 
             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(38, 36);
+            this.ms_macode_label.Location = new System.Drawing.Point(40, 14);
             this.ms_macode_label.Name = "ms_macode_label";
             this.ms_macode_label.Size = new System.Drawing.Size(110, 31);
             this.ms_macode_label.TabIndex = 0;
@@ -68,7 +68,7 @@
             // 
             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(442, 36);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(444, 14);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
             this.ma_prodcode_label.Size = new System.Drawing.Size(110, 31);
             this.ma_prodcode_label.TabIndex = 1;
@@ -78,7 +78,7 @@
             // 
             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(804, 36);
+            this.pr_detail_label.Location = new System.Drawing.Point(802, 14);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(110, 31);
             this.pr_detail_label.TabIndex = 2;
@@ -88,7 +88,7 @@
             // 
             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(38, 91);
+            this.remain_qty_label.Location = new System.Drawing.Point(40, 56);
             this.remain_qty_label.Name = "remain_qty_label";
             this.remain_qty_label.Size = new System.Drawing.Size(86, 31);
             this.remain_qty_label.TabIndex = 3;
@@ -98,7 +98,7 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.PrintNum_label.Location = new System.Drawing.Point(442, 91);
+            this.PrintNum_label.Location = new System.Drawing.Point(444, 56);
             this.PrintNum_label.Name = "PrintNum_label";
             this.PrintNum_label.Size = new System.Drawing.Size(62, 31);
             this.PrintNum_label.TabIndex = 4;
@@ -108,7 +108,7 @@
             // 
             this.ms_macode.AutoSize = true;
             this.ms_macode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_macode.Location = new System.Drawing.Point(185, 36);
+            this.ms_macode.Location = new System.Drawing.Point(152, 14);
             this.ms_macode.Name = "ms_macode";
             this.ms_macode.Size = new System.Drawing.Size(0, 31);
             this.ms_macode.TabIndex = 5;
@@ -118,7 +118,7 @@
             // 
             this.remain_qty.AutoSize = true;
             this.remain_qty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty.Location = new System.Drawing.Point(185, 90);
+            this.remain_qty.Location = new System.Drawing.Point(152, 55);
             this.remain_qty.Name = "remain_qty";
             this.remain_qty.Size = new System.Drawing.Size(0, 31);
             this.remain_qty.TabIndex = 6;
@@ -127,7 +127,7 @@
             // 
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_prodcode.Location = new System.Drawing.Point(576, 36);
+            this.ma_prodcode.Location = new System.Drawing.Point(556, 14);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
             this.ma_prodcode.TabIndex = 7;
@@ -136,7 +136,7 @@
             // 
             this.count.AutoSize = true;
             this.count.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.count.Location = new System.Drawing.Point(576, 91);
+            this.count.Location = new System.Drawing.Point(556, 56);
             this.count.Name = "count";
             this.count.Size = new System.Drawing.Size(28, 31);
             this.count.TabIndex = 8;
@@ -146,7 +146,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail.Location = new System.Drawing.Point(946, 36);
+            this.pr_detail.Location = new System.Drawing.Point(912, 14);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 31);
             this.pr_detail.TabIndex = 9;
@@ -155,7 +155,7 @@
             // 
             this.TSNLength_checkBox.AutoSize = true;
             this.TSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.TSNLength_checkBox.Location = new System.Drawing.Point(44, 153);
+            this.TSNLength_checkBox.Location = new System.Drawing.Point(46, 100);
             this.TSNLength_checkBox.Name = "TSNLength_checkBox";
             this.TSNLength_checkBox.Size = new System.Drawing.Size(117, 31);
             this.TSNLength_checkBox.TabIndex = 10;
@@ -166,7 +166,7 @@
             // 
             this.SNLength_checkBox.AutoSize = true;
             this.SNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.SNLength_checkBox.Location = new System.Drawing.Point(44, 200);
+            this.SNLength_checkBox.Location = new System.Drawing.Point(46, 147);
             this.SNLength_checkBox.Name = "SNLength_checkBox";
             this.SNLength_checkBox.Size = new System.Drawing.Size(106, 31);
             this.SNLength_checkBox.TabIndex = 11;
@@ -177,7 +177,7 @@
             // 
             this.TSNPre_checkBox.AutoSize = true;
             this.TSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.TSNPre_checkBox.Location = new System.Drawing.Point(448, 153);
+            this.TSNPre_checkBox.Location = new System.Drawing.Point(450, 100);
             this.TSNPre_checkBox.Name = "TSNPre_checkBox";
             this.TSNPre_checkBox.Size = new System.Drawing.Size(117, 31);
             this.TSNPre_checkBox.TabIndex = 12;
@@ -188,116 +188,28 @@
             // 
             this.SNPre_checkBox.AutoSize = true;
             this.SNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.SNPre_checkBox.Location = new System.Drawing.Point(448, 201);
+            this.SNPre_checkBox.Location = new System.Drawing.Point(450, 148);
             this.SNPre_checkBox.Name = "SNPre_checkBox";
             this.SNPre_checkBox.Size = new System.Drawing.Size(106, 31);
             this.SNPre_checkBox.TabIndex = 13;
             this.SNPre_checkBox.Text = "SN前缀";
             this.SNPre_checkBox.UseVisualStyleBackColor = true;
             // 
-            // TSNLength
-            // 
-            this.TSNLength.AllPower = null;
-            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(191, 151);
-            this.TSNLength.Name = "TSNLength";
-            this.TSNLength.Negative = false;
-            this.TSNLength.Power = null;
-            this.TSNLength.Size = new System.Drawing.Size(213, 34);
-            this.TSNLength.Str = null;
-            this.TSNLength.Str1 = null;
-            this.TSNLength.Str2 = null;
-            this.TSNLength.TabIndex = 14;
-            // 
-            // SNLength
-            // 
-            this.SNLength.AllPower = null;
-            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(191, 197);
-            this.SNLength.Name = "SNLength";
-            this.SNLength.Negative = false;
-            this.SNLength.Power = null;
-            this.SNLength.Size = new System.Drawing.Size(213, 34);
-            this.SNLength.Str = null;
-            this.SNLength.Str1 = null;
-            this.SNLength.Str2 = null;
-            this.SNLength.TabIndex = 15;
-            // 
-            // TSNPre
-            // 
-            this.TSNPre.AllPower = null;
-            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(582, 151);
-            this.TSNPre.Name = "TSNPre";
-            this.TSNPre.Power = null;
-            this.TSNPre.Size = new System.Drawing.Size(210, 34);
-            this.TSNPre.Str = null;
-            this.TSNPre.Str1 = null;
-            this.TSNPre.Str2 = null;
-            this.TSNPre.TabIndex = 16;
-            // 
-            // SNPre
-            // 
-            this.SNPre.AllPower = null;
-            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(582, 200);
-            this.SNPre.Name = "SNPre";
-            this.SNPre.Power = null;
-            this.SNPre.Size = new System.Drawing.Size(210, 34);
-            this.SNPre.Str = null;
-            this.SNPre.Str1 = null;
-            this.SNPre.Str2 = null;
-            this.SNPre.TabIndex = 17;
-            // 
             // tip
             // 
             this.tip.AutoSize = true;
             this.tip.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold);
-            this.tip.Location = new System.Drawing.Point(41, 252);
+            this.tip.Location = new System.Drawing.Point(43, 182);
             this.tip.Name = "tip";
             this.tip.Size = new System.Drawing.Size(158, 31);
             this.tip.TabIndex = 18;
             this.tip.Text = "采集提示信息";
             // 
-            // OperateResult
-            // 
-            this.OperateResult.Location = new System.Drawing.Point(44, 291);
-            this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1159, 356);
-            this.OperateResult.TabIndex = 19;
-            this.OperateResult.Text = "";
-            // 
-            // cancel
-            // 
-            this.cancel.AllPower = null;
-            this.cancel.BackColor = System.Drawing.Color.Transparent;
-            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(429, 669);
-            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(75, 28);
-            this.cancel.TabIndex = 20;
-            this.cancel.Text = "取消";
-            this.cancel.UseVisualStyleBackColor = false;
-            this.cancel.Click += new System.EventHandler(this.cancel_Click);
-            // 
             // in_label
             // 
             this.in_label.AutoSize = true;
             this.in_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.in_label.Location = new System.Drawing.Point(52, 672);
+            this.in_label.Location = new System.Drawing.Point(44, 479);
             this.in_label.Name = "in_label";
             this.in_label.Size = new System.Drawing.Size(72, 27);
             this.in_label.TabIndex = 21;
@@ -308,7 +220,7 @@
             this.code.AllPower = null;
             this.code.BackColor = System.Drawing.Color.White;
             this.code.ID = null;
-            this.code.Location = new System.Drawing.Point(147, 669);
+            this.code.Location = new System.Drawing.Point(139, 482);
             this.code.Name = "code";
             this.code.Power = null;
             this.code.Size = new System.Drawing.Size(196, 28);
@@ -318,11 +230,99 @@
             this.code.TabIndex = 22;
             this.code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.code_KeyDown);
             // 
+            // cancel
+            // 
+            this.cancel.AllPower = null;
+            this.cancel.BackColor = System.Drawing.Color.Transparent;
+            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(421, 482);
+            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(75, 28);
+            this.cancel.TabIndex = 20;
+            this.cancel.Text = "取消";
+            this.cancel.UseVisualStyleBackColor = false;
+            this.cancel.Click += new System.EventHandler(this.cancel_Click);
+            // 
+            // OperateResult
+            // 
+            this.OperateResult.Location = new System.Drawing.Point(46, 221);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(1153, 241);
+            this.OperateResult.TabIndex = 19;
+            this.OperateResult.Text = "";
+            // 
+            // SNPre
+            // 
+            this.SNPre.AllPower = null;
+            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(584, 147);
+            this.SNPre.Name = "SNPre";
+            this.SNPre.Power = null;
+            this.SNPre.Size = new System.Drawing.Size(210, 34);
+            this.SNPre.Str = null;
+            this.SNPre.Str1 = null;
+            this.SNPre.Str2 = null;
+            this.SNPre.TabIndex = 17;
+            // 
+            // TSNPre
+            // 
+            this.TSNPre.AllPower = null;
+            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(584, 98);
+            this.TSNPre.Name = "TSNPre";
+            this.TSNPre.Power = null;
+            this.TSNPre.Size = new System.Drawing.Size(210, 34);
+            this.TSNPre.Str = null;
+            this.TSNPre.Str1 = null;
+            this.TSNPre.Str2 = null;
+            this.TSNPre.TabIndex = 16;
+            // 
+            // SNLength
+            // 
+            this.SNLength.AllPower = null;
+            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(193, 144);
+            this.SNLength.Name = "SNLength";
+            this.SNLength.Negative = false;
+            this.SNLength.Power = null;
+            this.SNLength.Size = new System.Drawing.Size(213, 34);
+            this.SNLength.Str = null;
+            this.SNLength.Str1 = null;
+            this.SNLength.Str2 = null;
+            this.SNLength.TabIndex = 15;
+            // 
+            // TSNLength
+            // 
+            this.TSNLength.AllPower = null;
+            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(193, 98);
+            this.TSNLength.Name = "TSNLength";
+            this.TSNLength.Negative = false;
+            this.TSNLength.Power = null;
+            this.TSNLength.Size = new System.Drawing.Size(213, 34);
+            this.TSNLength.Str = null;
+            this.TSNLength.Str1 = null;
+            this.TSNLength.Str2 = null;
+            this.TSNLength.TabIndex = 14;
+            // 
             // Make_SeqProgramTransform
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1252, 712);
+            this.ClientSize = new System.Drawing.Size(1268, 526);
             this.Controls.Add(this.code);
             this.Controls.Add(this.in_label);
             this.Controls.Add(this.cancel);

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -11,7 +11,7 @@ using UAS_MES.DataOperate;
 using UAS_MES.Entity;
 using UAS_MES.PublicMethod;
 
-namespace UAS_MES.FunctionCode.Make
+namespace UAS_MES.Make
 {
     public partial class Make_SeqProgramTransform : Form
     {
@@ -78,9 +78,9 @@ namespace UAS_MES.FunctionCode.Make
                             {
                                 //按照out出的工单号查出工单相关信息，并赋值到相关控件
                                 sql.Clear();
-                                sql.Append("select ma_code as ms_macode,mcd_okqty,ma_qty,ma_qty-mcd_inqty as remain_qty,pr_detail,pr_code as ma_prodcode");
+                                sql.Append("select ma_code as ms_macode,mcd_okqty,ma_qty,ma_qty-mcd_inqty as remain_qty,pr_detail,pr_code as ma_prodcode ");
                                 sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
-                                sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_sncode=:sncode");
+                                sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_sncode=:sncode and mcd_stepcode='" + User.CurrentStepCode + "'");
                                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", code.Text);
                                 if (dt.Rows.Count > 0)
                                 {
@@ -103,6 +103,12 @@ namespace UAS_MES.FunctionCode.Make
                                 }
                                 //获取需要关联采集的信息，以及校验规则
                                 ListA = (DataTable)dh.ExecuteSql("select * from productsnrelation where psr_prodcode='" + ma_prodcode.Text + "' order by psr_detno", "select");
+                                //没有获取到就提示错误请维护产品对应的关联采集信息
+                                if (ListA.Rows.Count==0) {
+                                    OperateResult.AppendText(">>请维护产品对应的关联采集信息\n", Color.Red);
+                                    OperateResult.AppendText("<<请输入TSN\n", Color.Green);
+                                    return;
+                                }
                                 hs = new Hashtable();
                                 step = 1;
 
@@ -142,7 +148,9 @@ namespace UAS_MES.FunctionCode.Make
                             //SN校验成功，合法,记录下SN
                             SN = code.Text;
                             //开始进行校验规则
-                            OperateResult.AppendText("<<请输入" + ListA.Rows[0]["psr_type"] + "\n", Color.Green);
+                            if (ListA.Rows.Count>0) {
+                                OperateResult.AppendText("<<请输入" + ListA.Rows[0]["psr_type"] + "\n", Color.Green);
+                            }
                             //step+1
                             step = 2;
                         }
@@ -208,9 +216,9 @@ namespace UAS_MES.FunctionCode.Make
         /// <param name="step"></param>
         private bool checkRules(int step)
         {
-            type = ListA.Rows[step - 1]["psr_type"].ToString()=="WIFI"?"MAC": ListA.Rows[step - 1]["psr_type"].ToString();
+            type = ListA.Rows[step - 2]["psr_type"].ToString()=="WIFI"?"MAC": ListA.Rows[step - 2]["psr_type"].ToString();
             //如果前缀和长度都满足的话
-            if ((ListA.Rows[step-1]["psr_length"].ToString() == "" ? true : code.Text.Length == ListA.Rows[step-1]["psr_length"].ToString().Length) && (ListA.Rows[0]["psr_prefix"].ToString() == "" ? true : code.Text.StartsWith(ListA.Rows[0]["psr_prefix"].ToString())))
+            if ((ListA.Rows[step-2]["psr_length"].ToString() == "" ? true : code.Text.Length == ListA.Rows[step-2]["psr_length"].ToString().Length) && (ListA.Rows[step - 2]["psr_prefix"].ToString() == "" ? true : code.Text.StartsWith(ListA.Rows[step - 2]["psr_prefix"].ToString())))
             {
                 switch (type)
                 {
@@ -296,8 +304,19 @@ namespace UAS_MES.FunctionCode.Make
 
                             //输出提示用户“>>序列号转换成功”，“>>关联采集成功”
                             OperateResult.AppendText(">>关联采集成功\n", Color.Green);
+                            //获取剩余数，刷新页面
+                            sql.Clear();
+                            sql.Append("select ma_qty-mcd_inqty as remain_qty ");
+                            sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
+                            sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_sncode=:sncode and mcd_stepcode='" + User.CurrentStepCode + "'");
+                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", SN);
+                            if (dt.Rows.Count>0) {
+                                remain_qty.Text = dt.Rows[0]["remain_qty"].ToString();
+                            }
                             //更新页面计数+1
                             count.Text = int.Parse(count.Text) + 1 + "";
+                            //完成之后,清除信息
+                            clearInfo();
                         }
                     }
                     else
@@ -309,13 +328,13 @@ namespace UAS_MES.FunctionCode.Make
                     return false;
                 }
                 else {
-                    OperateResult.AppendText("<<请输入"+ ListA.Rows[step]["psr_type"] + "\n", Color.Green);
+                    OperateResult.AppendText("<<请输入"+ ListA.Rows[step-1]["psr_type"] + "\n", Color.Green);
                     return true;
                 }
             }
             else {
                 //重新输入
-                OperateResult.AppendText(">>" + ListA.Rows[step-1]["psr_type"] + "校验不通过,请重新输入\n", Color.Red);
+                OperateResult.AppendText(">>" + ListA.Rows[step-2]["psr_type"] + "校验不通过,请重新输入\n", Color.Red);
                 return false;
             }
         }
@@ -441,7 +460,9 @@ namespace UAS_MES.FunctionCode.Make
             //步骤重置为0
             step = 0;
             //关联采集信息清空
-            hs.Clear();
+            if (hs!=null) {
+                hs.Clear();
+            }
         }
 
         private void cancel_Click(object sender, EventArgs e)

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

@@ -41,6 +41,11 @@
             this.afterTransSNLength_checkBox = new System.Windows.Forms.CheckBox();
             this.beforeTransSNPre_checkBox = new System.Windows.Forms.CheckBox();
             this.afterTransSNPre_checkBox = new System.Windows.Forms.CheckBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
+            this.changenum = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
+            this.afterTransSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
+            this.beforeTransSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.afterTransSNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.beforeTransSNPre = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ms_makecode_lock = new UAS_MES.CustomControl.CustomCheckBox.LockCheckBox();
@@ -48,50 +53,46 @@
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ReCall = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.beforeTransSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
-            this.afterTransSNLength = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
-            this.changenum = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
-            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.SuspendLayout();
             // 
             // pr_detail
             // 
             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(780, 18);
+            this.pr_detail.Location = new System.Drawing.Point(897, 23);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 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, 31);
             this.pr_detail.TabIndex = 65;
             // 
             // ms_makecode_label
             // 
             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(20, 22);
+            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.Name = "ms_makecode_label";
-            this.ms_makecode_label.Size = new System.Drawing.Size(0, 27);
+            this.ms_makecode_label.Size = new System.Drawing.Size(0, 31);
             this.ms_makecode_label.TabIndex = 61;
             // 
             // ma_prodcode
             // 
             this.ma_prodcode.AutoSize = true;
             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(473, 18);
+            this.ma_prodcode.Location = new System.Drawing.Point(603, 22);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 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, 31);
             this.ma_prodcode.TabIndex = 64;
             // 
             // 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(656, 18);
+            this.pr_detail_label.Location = new System.Drawing.Point(787, 22);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             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(110, 31);
             this.pr_detail_label.TabIndex = 62;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -99,10 +100,10 @@
             // 
             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(352, 18);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(485, 22);
             this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
-            this.ma_prodcode_label.Size = new System.Drawing.Size(92, 27);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(110, 31);
             this.ma_prodcode_label.TabIndex = 63;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -110,10 +111,10 @@
             // 
             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(20, 552);
+            this.sncode_label.Location = new System.Drawing.Point(22, 662);
             this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sncode_label.Name = "sncode_label";
-            this.sncode_label.Size = new System.Drawing.Size(72, 27);
+            this.sncode_label.Size = new System.Drawing.Size(86, 31);
             this.sncode_label.TabIndex = 68;
             this.sncode_label.Text = "录入框";
             // 
@@ -121,10 +122,10 @@
             // 
             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(395, 552);
-            this.ChangeResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ChangeResult.Location = new System.Drawing.Point(444, 662);
+            this.ChangeResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ChangeResult.Name = "ChangeResult";
-            this.ChangeResult.Size = new System.Drawing.Size(154, 31);
+            this.ChangeResult.Size = new System.Drawing.Size(184, 35);
             this.ChangeResult.TabIndex = 70;
             this.ChangeResult.Text = "修改转换结果";
             this.ChangeResult.UseVisualStyleBackColor = true;
@@ -133,10 +134,10 @@
             // 
             this.changenum_lanel.AutoSize = true;
             this.changenum_lanel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.changenum_lanel.Location = new System.Drawing.Point(585, 552);
+            this.changenum_lanel.Location = new System.Drawing.Point(658, 662);
             this.changenum_lanel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.changenum_lanel.Name = "changenum_lanel";
-            this.changenum_lanel.Size = new System.Drawing.Size(92, 27);
+            this.changenum_lanel.Size = new System.Drawing.Size(110, 31);
             this.changenum_lanel.TabIndex = 71;
             this.changenum_lanel.Text = "转换数量";
             // 
@@ -144,10 +145,10 @@
             // 
             this.beforeTransSNLength_checkBox.AutoSize = true;
             this.beforeTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(27, 78);
+            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(30, 94);
             this.beforeTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.beforeTransSNLength_checkBox.Name = "beforeTransSNLength_checkBox";
-            this.beforeTransSNLength_checkBox.Size = new System.Drawing.Size(168, 27);
+            this.beforeTransSNLength_checkBox.Size = new System.Drawing.Size(198, 31);
             this.beforeTransSNLength_checkBox.TabIndex = 81;
             this.beforeTransSNLength_checkBox.Text = "转换前序列号长度";
             this.beforeTransSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -156,10 +157,10 @@
             // 
             this.afterTransSNLength_checkBox.AutoSize = true;
             this.afterTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(27, 120);
+            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(30, 144);
             this.afterTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.afterTransSNLength_checkBox.Name = "afterTransSNLength_checkBox";
-            this.afterTransSNLength_checkBox.Size = new System.Drawing.Size(168, 27);
+            this.afterTransSNLength_checkBox.Size = new System.Drawing.Size(198, 31);
             this.afterTransSNLength_checkBox.TabIndex = 82;
             this.afterTransSNLength_checkBox.Text = "转换后序列号长度";
             this.afterTransSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -168,10 +169,10 @@
             // 
             this.beforeTransSNPre_checkBox.AutoSize = true;
             this.beforeTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(562, 77);
+            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(632, 92);
             this.beforeTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.beforeTransSNPre_checkBox.Name = "beforeTransSNPre_checkBox";
-            this.beforeTransSNPre_checkBox.Size = new System.Drawing.Size(168, 27);
+            this.beforeTransSNPre_checkBox.Size = new System.Drawing.Size(198, 31);
             this.beforeTransSNPre_checkBox.TabIndex = 83;
             this.beforeTransSNPre_checkBox.Text = "转换前序列号前缀";
             this.beforeTransSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -180,25 +181,84 @@
             // 
             this.afterTransSNPre_checkBox.AutoSize = true;
             this.afterTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(562, 118);
+            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(632, 142);
             this.afterTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.afterTransSNPre_checkBox.Name = "afterTransSNPre_checkBox";
-            this.afterTransSNPre_checkBox.Size = new System.Drawing.Size(168, 27);
+            this.afterTransSNPre_checkBox.Size = new System.Drawing.Size(198, 31);
             this.afterTransSNPre_checkBox.TabIndex = 84;
             this.afterTransSNPre_checkBox.Text = "转换后序列号前缀";
             this.afterTransSNPre_checkBox.UseVisualStyleBackColor = true;
             // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label1.Location = new System.Drawing.Point(22, 23);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(110, 31);
+            this.label1.TabIndex = 93;
+            this.label1.Text = "归属工单";
+            // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(136, 22);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(244, 32);
+            this.ma_code.TabIndex = 92;
+            this.ma_code.TableName = null;
+            this.ma_code.TextBoxEnable = false;
+            // 
+            // changenum
+            // 
+            this.changenum.Enabled = false;
+            this.changenum.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.changenum.Location = new System.Drawing.Point(830, 662);
+            this.changenum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.changenum.Name = "changenum";
+            this.changenum.Size = new System.Drawing.Size(204, 34);
+            this.changenum.TabIndex = 91;
+            this.changenum.Text = "0";
+            // 
+            // afterTransSNLength
+            // 
+            this.afterTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.afterTransSNLength.Location = new System.Drawing.Point(269, 140);
+            this.afterTransSNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.afterTransSNLength.Name = "afterTransSNLength";
+            this.afterTransSNLength.Size = new System.Drawing.Size(250, 34);
+            this.afterTransSNLength.TabIndex = 90;
+            this.afterTransSNLength.Text = "0";
+            // 
+            // beforeTransSNLength
+            // 
+            this.beforeTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.beforeTransSNLength.Location = new System.Drawing.Point(269, 90);
+            this.beforeTransSNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.beforeTransSNLength.Name = "beforeTransSNLength";
+            this.beforeTransSNLength.Size = new System.Drawing.Size(250, 34);
+            this.beforeTransSNLength.TabIndex = 89;
+            this.beforeTransSNLength.Text = "0";
+            // 
             // afterTransSNPre
             // 
             this.afterTransSNPre.AllPower = null;
             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(775, 118);
+            this.afterTransSNPre.Location = new System.Drawing.Point(872, 142);
             this.afterTransSNPre.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.afterTransSNPre.Name = "afterTransSNPre";
             this.afterTransSNPre.Power = null;
-            this.afterTransSNPre.Size = new System.Drawing.Size(223, 29);
+            this.afterTransSNPre.Size = new System.Drawing.Size(250, 34);
             this.afterTransSNPre.Str = null;
             this.afterTransSNPre.Str1 = null;
             this.afterTransSNPre.Str2 = null;
@@ -210,11 +270,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(775, 77);
+            this.beforeTransSNPre.Location = new System.Drawing.Point(872, 92);
             this.beforeTransSNPre.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.beforeTransSNPre.Name = "beforeTransSNPre";
             this.beforeTransSNPre.Power = null;
-            this.beforeTransSNPre.Size = new System.Drawing.Size(223, 29);
+            this.beforeTransSNPre.Size = new System.Drawing.Size(250, 34);
             this.beforeTransSNPre.Str = null;
             this.beforeTransSNPre.Str1 = null;
             this.beforeTransSNPre.Str2 = null;
@@ -225,10 +285,10 @@
             this.ms_makecode_lock.AutoSize = true;
             this.ms_makecode_lock.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_makecode_lock.LeaveEvent = false;
-            this.ms_makecode_lock.Location = new System.Drawing.Point(27, 22);
+            this.ms_makecode_lock.Location = new System.Drawing.Point(383, 22);
             this.ms_makecode_lock.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ms_makecode_lock.Name = "ms_makecode_lock";
-            this.ms_makecode_lock.Size = new System.Drawing.Size(61, 24);
+            this.ms_makecode_lock.Size = new System.Drawing.Size(72, 28);
             this.ms_makecode_lock.TabIndex = 80;
             this.ms_makecode_lock.Text = "锁定";
             this.ms_makecode_lock.UseVisualStyleBackColor = true;
@@ -236,10 +296,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(27, 177);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.OperateResult.Location = new System.Drawing.Point(30, 212);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1081, 357);
+            this.OperateResult.Size = new System.Drawing.Size(1216, 428);
             this.OperateResult.TabIndex = 78;
             this.OperateResult.Text = "";
             // 
@@ -249,11 +309,11 @@
             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(126, 552);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.sncode.Location = new System.Drawing.Point(142, 662);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4);
             this.sncode.Name = "sncode";
             this.sncode.Power = "ifwrite";
-            this.sncode.Size = new System.Drawing.Size(212, 29);
+            this.sncode.Size = new System.Drawing.Size(238, 34);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -268,13 +328,13 @@
             this.ReCall.DownImage = ((System.Drawing.Image)(resources.GetObject("ReCall.DownImage")));
             this.ReCall.Image = ((System.Drawing.Image)(resources.GetObject("ReCall.Image")));
             this.ReCall.IsShowBorder = true;
-            this.ReCall.Location = new System.Drawing.Point(584, 598);
-            this.ReCall.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ReCall.Location = new System.Drawing.Point(657, 718);
+            this.ReCall.Margin = new System.Windows.Forms.Padding(4);
             this.ReCall.MoveImage = ((System.Drawing.Image)(resources.GetObject("ReCall.MoveImage")));
             this.ReCall.Name = "ReCall";
             this.ReCall.NormalImage = ((System.Drawing.Image)(resources.GetObject("ReCall.NormalImage")));
             this.ReCall.Power = null;
-            this.ReCall.Size = new System.Drawing.Size(93, 30);
+            this.ReCall.Size = new System.Drawing.Size(105, 36);
             this.ReCall.TabIndex = 74;
             this.ReCall.Text = "撤销输入";
             this.ReCall.UseVisualStyleBackColor = true;
@@ -287,73 +347,25 @@
             this.Confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("Confirm.DownImage")));
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
-            this.Confirm.Location = new System.Drawing.Point(453, 598);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Confirm.Location = new System.Drawing.Point(510, 718);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
             this.Confirm.Power = null;
-            this.Confirm.Size = new System.Drawing.Size(93, 30);
+            this.Confirm.Size = new System.Drawing.Size(105, 36);
             this.Confirm.TabIndex = 73;
             this.Confirm.Tag = "IfWrite";
             this.Confirm.Text = "确认";
             this.Confirm.UseVisualStyleBackColor = true;
             this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
             // 
-            // beforeTransSNLength
-            // 
-            this.beforeTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNLength.Location = new System.Drawing.Point(239, 75);
-            this.beforeTransSNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.beforeTransSNLength.Name = "beforeTransSNLength";
-            this.beforeTransSNLength.Size = new System.Drawing.Size(223, 29);
-            this.beforeTransSNLength.TabIndex = 89;
-            this.beforeTransSNLength.Text = "0";
-            // 
-            // afterTransSNLength
-            // 
-            this.afterTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength.Location = new System.Drawing.Point(239, 117);
-            this.afterTransSNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.afterTransSNLength.Name = "afterTransSNLength";
-            this.afterTransSNLength.Size = new System.Drawing.Size(223, 29);
-            this.afterTransSNLength.TabIndex = 90;
-            this.afterTransSNLength.Text = "0";
-            // 
-            // changenum
-            // 
-            this.changenum.Enabled = false;
-            this.changenum.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.changenum.Location = new System.Drawing.Point(738, 552);
-            this.changenum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.changenum.Name = "changenum";
-            this.changenum.Size = new System.Drawing.Size(182, 29);
-            this.changenum.TabIndex = 91;
-            this.changenum.Text = "0";
-            // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = null;
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = null;
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(101, 20);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(217, 27);
-            this.ma_code.TabIndex = 92;
-            this.ma_code.TableName = null;
-            this.ma_code.TextBoxEnable = false;
-            // 
             // Make_SeqTransform
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1132, 640);
+            this.ClientSize = new System.Drawing.Size(1274, 768);
+            this.Controls.Add(this.label1);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.changenum);
             this.Controls.Add(this.afterTransSNLength);
@@ -378,7 +390,7 @@
             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, 3, 4, 3);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Make_SeqTransform";
             this.Tag = "Make!SeqTransform";
             this.Text = " ";
@@ -413,5 +425,6 @@
         private CustomControl.TextBoxWithIcon.TextBoxNumOnly afterTransSNLength;
         private CustomControl.TextBoxWithIcon.TextBoxNumOnly changenum;
         private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
+        private System.Windows.Forms.Label label1;
     }
 }

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -220,7 +220,7 @@ namespace UAS_MES.Make
             sql.Append("select bg_code||':'||bg_name bg_name,bg_code from badgroup left join (select pb_badgroup,pr_kind ");
             sql.Append("from product left join productkind on pk_name=pr_kind ");
             sql.Append("left join productbadgroup on pk_code=PB_KINDCODE where pr_code='" + ma_prodcode.Text + "')");
-            sql.Append("on pb_badgroup=bg_code order by pr_kind desc");
+            sql.Append("on pb_badgroup=bg_code order by pr_kind ");
             DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             bc_groupcode.DisplayMember = "bg_name";
             bc_groupcode.ValueMember = "bg_code";

UAS-出货标签管理/UAS_出货标签管理.cs

@@ -697,7 +697,7 @@ namespace UAS_LabelMachine
             //保存参数打印
             SingleDoc.Save();
             SingleDoc.Printer.SwitchTo(SingleLabelPrinter.Text);
-            //SingleDoc.PrintDocument();
+            SingleDoc.PrintDocument();
             LogManager.DoLog("执行打印单盘,pib_id:" + LabelInf.Rows[CurrentRowIndex].Cells["pib_id1"].Value.ToString() + ",标签地址" + LabelUrl);
             LabelInf.Rows[CurrentRowIndex].Cells["pib_ifprint"].Value = true;
         }