修改序列转换，简化代码

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

@@ -44,7 +44,6 @@
             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();
-            this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ReCall = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -52,46 +51,43 @@
             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(877, 22);
-            this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail.Location = new System.Drawing.Point(585, 15);
             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 = 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(22, 25);
-            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;
             // 
             // 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(533, 22);
-            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_prodcode.Location = new System.Drawing.Point(355, 15);
             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 = 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(738, 22);
-            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_detail_label.Location = new System.Drawing.Point(492, 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 = "产品名称";
             // 
@@ -99,10 +95,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(396, 22);
-            this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(264, 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 = "产品编号";
             // 
@@ -110,10 +105,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(22, 662);
-            this.sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.sncode_label.Location = new System.Drawing.Point(15, 441);
             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 = "录入框";
             // 
@@ -121,10 +115,9 @@
             // 
             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(444, 662);
-            this.ChangeResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ChangeResult.Location = new System.Drawing.Point(296, 441);
             this.ChangeResult.Name = "ChangeResult";
-            this.ChangeResult.Size = new System.Drawing.Size(184, 35);
+            this.ChangeResult.Size = new System.Drawing.Size(125, 25);
             this.ChangeResult.TabIndex = 70;
             this.ChangeResult.Text = "修改转换结果";
             this.ChangeResult.UseVisualStyleBackColor = true;
@@ -133,10 +126,9 @@
             // 
             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(658, 662);
-            this.changenum_lanel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.changenum_lanel.Location = new System.Drawing.Point(439, 441);
             this.changenum_lanel.Name = "changenum_lanel";
-            this.changenum_lanel.Size = new System.Drawing.Size(110, 31);
+            this.changenum_lanel.Size = new System.Drawing.Size(74, 21);
             this.changenum_lanel.TabIndex = 71;
             this.changenum_lanel.Text = "转换数量";
             // 
@@ -144,9 +136,10 @@
             // 
             this.beforeTransSNLength_checkBox.AutoSize = true;
             this.beforeTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(30, 95);
+            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(20, 63);
+            this.beforeTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.beforeTransSNLength_checkBox.Name = "beforeTransSNLength_checkBox";
-            this.beforeTransSNLength_checkBox.Size = new System.Drawing.Size(198, 31);
+            this.beforeTransSNLength_checkBox.Size = new System.Drawing.Size(140, 24);
             this.beforeTransSNLength_checkBox.TabIndex = 81;
             this.beforeTransSNLength_checkBox.Text = "转换前序列号长度";
             this.beforeTransSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -155,9 +148,10 @@
             // 
             this.afterTransSNLength_checkBox.AutoSize = true;
             this.afterTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(30, 144);
+            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(20, 96);
+            this.afterTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.afterTransSNLength_checkBox.Name = "afterTransSNLength_checkBox";
-            this.afterTransSNLength_checkBox.Size = new System.Drawing.Size(198, 31);
+            this.afterTransSNLength_checkBox.Size = new System.Drawing.Size(140, 24);
             this.afterTransSNLength_checkBox.TabIndex = 82;
             this.afterTransSNLength_checkBox.Text = "转换后序列号长度";
             this.afterTransSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -166,9 +160,10 @@
             // 
             this.beforeTransSNPre_checkBox.AutoSize = true;
             this.beforeTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(631, 93);
+            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(421, 62);
+            this.beforeTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.beforeTransSNPre_checkBox.Name = "beforeTransSNPre_checkBox";
-            this.beforeTransSNPre_checkBox.Size = new System.Drawing.Size(198, 31);
+            this.beforeTransSNPre_checkBox.Size = new System.Drawing.Size(140, 24);
             this.beforeTransSNPre_checkBox.TabIndex = 83;
             this.beforeTransSNPre_checkBox.Text = "转换前序列号前缀";
             this.beforeTransSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -177,9 +172,10 @@
             // 
             this.afterTransSNPre_checkBox.AutoSize = true;
             this.afterTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(631, 143);
+            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(421, 95);
+            this.afterTransSNPre_checkBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.afterTransSNPre_checkBox.Name = "afterTransSNPre_checkBox";
-            this.afterTransSNPre_checkBox.Size = new System.Drawing.Size(198, 31);
+            this.afterTransSNPre_checkBox.Size = new System.Drawing.Size(140, 24);
             this.afterTransSNPre_checkBox.TabIndex = 84;
             this.afterTransSNPre_checkBox.Text = "转换后序列号前缀";
             this.afterTransSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -190,10 +186,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(871, 143);
+            this.afterTransSNPre.Location = new System.Drawing.Point(581, 95);
+            this.afterTransSNPre.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             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;
@@ -205,10 +202,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(871, 93);
+            this.beforeTransSNPre.Location = new System.Drawing.Point(581, 62);
+            this.beforeTransSNPre.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             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;
@@ -218,39 +216,20 @@
             // 
             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.Location = new System.Drawing.Point(30, 26);
+            this.ms_makecode_lock.Location = new System.Drawing.Point(20, 17);
+            this.ms_makecode_lock.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.ms_makecode_lock.Name = "ms_makecode_lock";
-            this.ms_makecode_lock.Size = new System.Drawing.Size(72, 28);
+            this.ms_makecode_lock.Size = new System.Drawing.Size(51, 21);
             this.ms_makecode_lock.TabIndex = 80;
             this.ms_makecode_lock.Text = "锁定";
             this.ms_makecode_lock.UseVisualStyleBackColor = true;
             // 
-            // 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.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(108, 22);
-            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(221, 32);
-            this.ma_code.TabIndex = 79;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "ma_code";
-            this.ma_code.TextBoxEnable = true;
-            // 
             // 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(30, 212);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperateResult.Location = new System.Drawing.Point(20, 141);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1216, 429);
+            this.OperateResult.Size = new System.Drawing.Size(812, 287);
             this.OperateResult.TabIndex = 78;
             this.OperateResult.Text = "";
             // 
@@ -259,11 +238,10 @@
             this.sncode.AllPower = "ifall";
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(143, 662);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.sncode.Location = new System.Drawing.Point(95, 441);
             this.sncode.Name = "sncode";
             this.sncode.Power = "ifwrite";
-            this.sncode.Size = new System.Drawing.Size(238, 28);
+            this.sncode.Size = new System.Drawing.Size(160, 21);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
@@ -278,13 +256,12 @@
             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(657, 718);
-            this.ReCall.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ReCall.Location = new System.Drawing.Point(438, 479);
             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(105, 36);
+            this.ReCall.Size = new System.Drawing.Size(70, 24);
             this.ReCall.TabIndex = 74;
             this.ReCall.Text = "撤销输入";
             this.ReCall.UseVisualStyleBackColor = true;
@@ -297,13 +274,12 @@
             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(510, 718);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Confirm.Location = new System.Drawing.Point(340, 479);
             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(105, 36);
+            this.Confirm.Size = new System.Drawing.Size(70, 24);
             this.Confirm.TabIndex = 73;
             this.Confirm.Tag = "IfWrite";
             this.Confirm.Text = "确认";
@@ -312,34 +288,55 @@
             // 
             // beforeTransSNLength
             // 
-            this.beforeTransSNLength.Location = new System.Drawing.Point(247, 97);
+            this.beforeTransSNLength.Location = new System.Drawing.Point(165, 65);
+            this.beforeTransSNLength.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.beforeTransSNLength.Name = "beforeTransSNLength";
-            this.beforeTransSNLength.Size = new System.Drawing.Size(250, 28);
+            this.beforeTransSNLength.Size = new System.Drawing.Size(168, 21);
             this.beforeTransSNLength.TabIndex = 89;
             this.beforeTransSNLength.Text = "0";
             // 
             // afterTransSNLength
             // 
-            this.afterTransSNLength.Location = new System.Drawing.Point(247, 149);
+            this.afterTransSNLength.Location = new System.Drawing.Point(165, 99);
+            this.afterTransSNLength.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.afterTransSNLength.Name = "afterTransSNLength";
-            this.afterTransSNLength.Size = new System.Drawing.Size(250, 28);
+            this.afterTransSNLength.Size = new System.Drawing.Size(168, 21);
             this.afterTransSNLength.TabIndex = 90;
             this.afterTransSNLength.Text = "0";
             // 
             // changenum
             // 
             this.changenum.Enabled = false;
-            this.changenum.Location = new System.Drawing.Point(830, 662);
+            this.changenum.Location = new System.Drawing.Point(553, 441);
+            this.changenum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.changenum.Name = "changenum";
-            this.changenum.Size = new System.Drawing.Size(203, 28);
+            this.changenum.Size = new System.Drawing.Size(137, 21);
             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(76, 16);
+            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(163, 22);
+            this.ma_code.TabIndex = 92;
+            this.ma_code.TableName = null;
+            this.ma_code.TextBoxEnable = false;
+            // 
             // 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, 768);
+            this.ClientSize = new System.Drawing.Size(849, 512);
+            this.Controls.Add(this.ma_code);
             this.Controls.Add(this.changenum);
             this.Controls.Add(this.afterTransSNLength);
             this.Controls.Add(this.beforeTransSNLength);
@@ -350,7 +347,6 @@
             this.Controls.Add(this.afterTransSNLength_checkBox);
             this.Controls.Add(this.beforeTransSNLength_checkBox);
             this.Controls.Add(this.ms_makecode_lock);
-            this.Controls.Add(this.ma_code);
             this.Controls.Add(this.OperateResult);
             this.Controls.Add(this.sncode);
             this.Controls.Add(this.ReCall);
@@ -364,7 +360,6 @@
             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, 5, 4, 5);
             this.Name = "Make_SeqTransform";
             this.Tag = "Make!SeqTransform";
             this.Text = " ";
@@ -388,7 +383,6 @@
         private CustomControl.ButtonUtil.NormalButton ReCall;
         private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
-        private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
         private CustomControl.CustomCheckBox.LockCheckBox ms_makecode_lock;
         private System.Windows.Forms.CheckBox beforeTransSNLength_checkBox;
         private System.Windows.Forms.CheckBox afterTransSNLength_checkBox;
@@ -399,5 +393,6 @@
         private CustomControl.TextBoxWithIcon.TextBoxNumOnly beforeTransSNLength;
         private CustomControl.TextBoxWithIcon.TextBoxNumOnly afterTransSNLength;
         private CustomControl.TextBoxWithIcon.TextBoxNumOnly changenum;
+        private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
     }
 }

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -63,9 +63,7 @@ namespace UAS_MES.Make
                         //用户填写了工单号，那么序列号必须要是该工单的，否则提示错误
                         if (LogicHandler.CheckStepSNAndMacode(macode, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out errorMessage))
                         {
-                            OperateResult.AppendText(">>序列号" + sncode.Text + "不属于工单" + ma_code.Text + ",请重新输入或者切换工单\n", Color.Red);
                             //通过工单序列号关系验证
-
                             string ErrorMessage = "";
                             bool ifFirst;
                             //bsncode为空，就说明是输入转换之前的序列号
@@ -73,14 +71,10 @@ namespace UAS_MES.Make
                             {
                                 //判断用户是否锁定输入转换前序列号长度，
                                 if (!checkLengthOrPre(beforeTransSNLength_checkBox, beforeTransSNLength, "长度"))
-                                {
                                     return;
-                                }
                                 //判断用户是否锁定输入转换前序列号前缀，
                                 if (!checkLengthOrPre(beforeTransSNPre_checkBox, beforeTransSNPre, "前缀"))
-                                {
                                     return;
-                                }
                                 switch (ChangeResult.CheckState)
                                 {
                                     //勾选是修改已转换的序列，矫正修改错了的序列号
@@ -125,21 +119,16 @@ namespace UAS_MES.Make
                             {
                                 //判断用户是否锁定输入转换后序列号长度，
                                 if (!checkLengthOrPre(afterTransSNLength_checkBox, afterTransSNLength, "长度"))
-                                {
                                     return;
-                                }
                                 //判断用户是否锁定输入转换后序列号前缀，
                                 if (!checkLengthOrPre(afterTransSNPre_checkBox, afterTransSNPre, "前缀"))
-                                {
                                     return;
-                                }
                                 //如果两次输入的序列号相同进行提示，不相同则进行下一步
                                 if (bsncode != sncode.Text)
                                 {
                                     //勾选了修改转换结果
                                     if (ChangeResult.Checked)
                                     {
-
                                         if (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
                                         {
                                             //查询ms_firstsn
@@ -158,9 +147,7 @@ namespace UAS_MES.Make
                                             changenum.Text = int.Parse(changenum.Text) + 1 + "";
                                         }
                                         else
-                                        {
                                             OperateResult.AppendText(">>该序列号已存在，请输入其他序列号\n", Color.Red);
-                                        }
                                     }
                                     //未勾选修改转换结果
                                     else
@@ -183,31 +170,21 @@ namespace UAS_MES.Make
                                             changenum.Text = int.Parse(changenum.Text) + 1 + "";
                                         }
                                         else
-                                        {
                                             OperateResult.AppendText(">>该序列号已存在，请输入其他序列号\n", Color.Red);
-                                        }
                                     }
                                 }
                                 else
-                                {
                                     OperateResult.AppendText(">>相同序列号不能进行转换\n", Color.Red);
-                                }
                             }
                         }
                         else
-                        {
                             OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
-                        }
                     }
                     else
-                    {
                         macode = dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode='" + sncode.Text + "' or ms_beforesn='" + sncode.Text + "'").ToString();
-                    }
                 }
                 else
-                {
                     OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
-                }
             }
         }