不勾选两次输入SN过站，勾选重新转换提示输入TSN

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

@@ -63,9 +63,9 @@
             // 
             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(36, 12);
+            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(92, 27);
+            this.ms_macode_label.Size = new System.Drawing.Size(110, 31);
             this.ms_macode_label.TabIndex = 0;
             this.ms_macode_label.Text = "工单编号";
             // 
@@ -73,9 +73,9 @@
             // 
             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(395, 12);
+            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(92, 27);
+            this.ma_prodcode_label.Size = new System.Drawing.Size(110, 31);
             this.ma_prodcode_label.TabIndex = 1;
             this.ma_prodcode_label.Text = "产品编号";
             // 
@@ -83,9 +83,9 @@
             // 
             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(713, 12);
+            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(92, 27);
+            this.pr_detail_label.Size = new System.Drawing.Size(110, 31);
             this.pr_detail_label.TabIndex = 2;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -93,9 +93,9 @@
             // 
             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(36, 47);
+            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(72, 27);
+            this.remain_qty_label.Size = new System.Drawing.Size(86, 31);
             this.remain_qty_label.TabIndex = 3;
             this.remain_qty_label.Text = "剩余数";
             // 
@@ -103,9 +103,9 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.PrintNum_label.Location = new System.Drawing.Point(395, 47);
+            this.PrintNum_label.Location = new System.Drawing.Point(444, 56);
             this.PrintNum_label.Name = "PrintNum_label";
-            this.PrintNum_label.Size = new System.Drawing.Size(52, 27);
+            this.PrintNum_label.Size = new System.Drawing.Size(62, 31);
             this.PrintNum_label.TabIndex = 4;
             this.PrintNum_label.Text = "计数";
             // 
@@ -113,9 +113,9 @@
             // 
             this.ms_macode.AutoSize = true;
             this.ms_macode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_macode.Location = new System.Drawing.Point(135, 12);
+            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, 27);
+            this.ms_macode.Size = new System.Drawing.Size(0, 31);
             this.ms_macode.TabIndex = 5;
             this.ms_macode.TextChanged += new System.EventHandler(this.ms_macode_TextChanged);
             // 
@@ -123,18 +123,18 @@
             // 
             this.remain_qty.AutoSize = true;
             this.remain_qty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty.Location = new System.Drawing.Point(135, 46);
+            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, 27);
+            this.remain_qty.Size = new System.Drawing.Size(0, 31);
             this.remain_qty.TabIndex = 6;
             // 
             // count
             // 
             this.count.AutoSize = true;
             this.count.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.count.Location = new System.Drawing.Point(494, 47);
+            this.count.Location = new System.Drawing.Point(556, 56);
             this.count.Name = "count";
-            this.count.Size = new System.Drawing.Size(24, 27);
+            this.count.Size = new System.Drawing.Size(28, 31);
             this.count.TabIndex = 8;
             this.count.Text = "0";
             // 
@@ -142,10 +142,10 @@
             // 
             this.TSNLength_checkBox.AutoSize = true;
             this.TSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.TSNLength_checkBox.Location = new System.Drawing.Point(41, 83);
+            this.TSNLength_checkBox.Location = new System.Drawing.Point(46, 100);
             this.TSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.TSNLength_checkBox.Name = "TSNLength_checkBox";
-            this.TSNLength_checkBox.Size = new System.Drawing.Size(100, 27);
+            this.TSNLength_checkBox.Size = new System.Drawing.Size(117, 31);
             this.TSNLength_checkBox.TabIndex = 10;
             this.TSNLength_checkBox.Text = "TSN长度";
             this.TSNLength_checkBox.UseVisualStyleBackColor = true;
@@ -154,10 +154,10 @@
             // 
             this.SNLength_checkBox.AutoSize = true;
             this.SNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.SNLength_checkBox.Location = new System.Drawing.Point(41, 122);
+            this.SNLength_checkBox.Location = new System.Drawing.Point(46, 146);
             this.SNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SNLength_checkBox.Name = "SNLength_checkBox";
-            this.SNLength_checkBox.Size = new System.Drawing.Size(90, 27);
+            this.SNLength_checkBox.Size = new System.Drawing.Size(106, 31);
             this.SNLength_checkBox.TabIndex = 11;
             this.SNLength_checkBox.Text = "SN长度";
             this.SNLength_checkBox.UseVisualStyleBackColor = true;
@@ -166,10 +166,10 @@
             // 
             this.TSNPre_checkBox.AutoSize = true;
             this.TSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.TSNPre_checkBox.Location = new System.Drawing.Point(400, 83);
+            this.TSNPre_checkBox.Location = new System.Drawing.Point(450, 100);
             this.TSNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.TSNPre_checkBox.Name = "TSNPre_checkBox";
-            this.TSNPre_checkBox.Size = new System.Drawing.Size(100, 27);
+            this.TSNPre_checkBox.Size = new System.Drawing.Size(117, 31);
             this.TSNPre_checkBox.TabIndex = 12;
             this.TSNPre_checkBox.Text = "TSN前缀";
             this.TSNPre_checkBox.UseVisualStyleBackColor = true;
@@ -178,10 +178,10 @@
             // 
             this.SNPre_checkBox.AutoSize = true;
             this.SNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.SNPre_checkBox.Location = new System.Drawing.Point(400, 123);
+            this.SNPre_checkBox.Location = new System.Drawing.Point(450, 148);
             this.SNPre_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SNPre_checkBox.Name = "SNPre_checkBox";
-            this.SNPre_checkBox.Size = new System.Drawing.Size(90, 27);
+            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;
@@ -190,9 +190,9 @@
             // 
             this.tip.AutoSize = true;
             this.tip.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold);
-            this.tip.Location = new System.Drawing.Point(38, 152);
+            this.tip.Location = new System.Drawing.Point(43, 182);
             this.tip.Name = "tip";
-            this.tip.Size = new System.Drawing.Size(132, 27);
+            this.tip.Size = new System.Drawing.Size(158, 31);
             this.tip.TabIndex = 18;
             this.tip.Text = "采集提示信息";
             // 
@@ -200,9 +200,9 @@
             // 
             this.in_label.AutoSize = true;
             this.in_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.in_label.Location = new System.Drawing.Point(38, 436);
+            this.in_label.Location = new System.Drawing.Point(43, 523);
             this.in_label.Name = "in_label";
-            this.in_label.Size = new System.Drawing.Size(72, 27);
+            this.in_label.Size = new System.Drawing.Size(86, 31);
             this.in_label.TabIndex = 21;
             this.in_label.Text = "录入框";
             // 
@@ -210,10 +210,10 @@
             // 
             this.ClearSn_code.Cursor = System.Windows.Forms.Cursors.Hand;
             this.ClearSn_code.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
-            this.ClearSn_code.Location = new System.Drawing.Point(368, 401);
-            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ClearSn_code.Location = new System.Drawing.Point(414, 481);
+            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ClearSn_code.Name = "ClearSn_code";
-            this.ClearSn_code.Size = new System.Drawing.Size(21, 20);
+            this.ClearSn_code.Size = new System.Drawing.Size(24, 24);
             this.ClearSn_code.TabIndex = 144;
             this.ClearSn_code.TabStop = false;
             this.ClearSn_code.Click += new System.EventHandler(this.cancel_Click);
@@ -222,10 +222,10 @@
             // 
             this.sn_code_label.AutoSize = true;
             this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_label.Location = new System.Drawing.Point(38, 401);
+            this.sn_code_label.Location = new System.Drawing.Point(43, 481);
             this.sn_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(72, 27);
+            this.sn_code_label.Size = new System.Drawing.Size(86, 31);
             this.sn_code_label.TabIndex = 142;
             this.sn_code_label.Text = "序列号";
             // 
@@ -233,14 +233,15 @@
             // 
             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(368, 437);
+            this.ChangeResult.Location = new System.Drawing.Point(414, 524);
             this.ChangeResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ChangeResult.Name = "ChangeResult";
             this.ChangeResult.Power = "ifspecial";
-            this.ChangeResult.Size = new System.Drawing.Size(114, 31);
+            this.ChangeResult.Size = new System.Drawing.Size(136, 35);
             this.ChangeResult.TabIndex = 145;
             this.ChangeResult.Text = "重新转换";
             this.ChangeResult.UseVisualStyleBackColor = true;
+            this.ChangeResult.CheckedChanged += new System.EventHandler(this.ChangeResult_CheckedChanged);
             // 
             // show_sncode
             // 
@@ -249,11 +250,11 @@
             this.show_sncode.Enabled = false;
             this.show_sncode.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.show_sncode.ID = null;
-            this.show_sncode.Location = new System.Drawing.Point(123, 401);
-            this.show_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.show_sncode.Location = new System.Drawing.Point(138, 481);
+            this.show_sncode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.show_sncode.Name = "show_sncode";
             this.show_sncode.Power = null;
-            this.show_sncode.Size = new System.Drawing.Size(212, 29);
+            this.show_sncode.Size = new System.Drawing.Size(238, 34);
             this.show_sncode.Str = null;
             this.show_sncode.Str1 = null;
             this.show_sncode.Str2 = null;
@@ -264,11 +265,11 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(492, 12);
+            this.ma_prodcode.Location = new System.Drawing.Point(554, 14);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(146, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(164, 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 = 24;
             // 
             // pr_detail
@@ -276,11 +277,11 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(810, 12);
+            this.pr_detail.Location = new System.Drawing.Point(911, 14);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(146, 0);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(164, 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 = 23;
             // 
             // code
@@ -289,11 +290,11 @@
             this.code.BackColor = System.Drawing.Color.White;
             this.code.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.code.ID = null;
-            this.code.Location = new System.Drawing.Point(123, 438);
+            this.code.Location = new System.Drawing.Point(138, 526);
             this.code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.code.Name = "code";
             this.code.Power = null;
-            this.code.Size = new System.Drawing.Size(212, 29);
+            this.code.Size = new System.Drawing.Size(238, 34);
             this.code.Str = null;
             this.code.Str1 = null;
             this.code.Str2 = null;
@@ -303,10 +304,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.OperateResult.Location = new System.Drawing.Point(41, 184);
+            this.OperateResult.Location = new System.Drawing.Point(46, 221);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1025, 201);
+            this.OperateResult.Size = new System.Drawing.Size(1153, 240);
             this.OperateResult.TabIndex = 19;
             this.OperateResult.Text = "";
             // 
@@ -316,11 +317,11 @@
             this.SNPre.BackColor = System.Drawing.Color.White;
             this.SNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.SNPre.ID = null;
-            this.SNPre.Location = new System.Drawing.Point(519, 122);
+            this.SNPre.Location = new System.Drawing.Point(584, 146);
             this.SNPre.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SNPre.Name = "SNPre";
             this.SNPre.Power = null;
-            this.SNPre.Size = new System.Drawing.Size(187, 29);
+            this.SNPre.Size = new System.Drawing.Size(210, 34);
             this.SNPre.Str = null;
             this.SNPre.Str1 = null;
             this.SNPre.Str2 = null;
@@ -332,11 +333,11 @@
             this.TSNPre.BackColor = System.Drawing.Color.White;
             this.TSNPre.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.TSNPre.ID = null;
-            this.TSNPre.Location = new System.Drawing.Point(519, 82);
+            this.TSNPre.Location = new System.Drawing.Point(584, 98);
             this.TSNPre.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.TSNPre.Name = "TSNPre";
             this.TSNPre.Power = null;
-            this.TSNPre.Size = new System.Drawing.Size(187, 29);
+            this.TSNPre.Size = new System.Drawing.Size(210, 34);
             this.TSNPre.Str = null;
             this.TSNPre.Str1 = null;
             this.TSNPre.Str2 = null;
@@ -348,12 +349,12 @@
             this.SNLength.BackColor = System.Drawing.Color.White;
             this.SNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.SNLength.ID = null;
-            this.SNLength.Location = new System.Drawing.Point(172, 120);
+            this.SNLength.Location = new System.Drawing.Point(194, 144);
             this.SNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SNLength.Name = "SNLength";
             this.SNLength.Negative = false;
             this.SNLength.Power = null;
-            this.SNLength.Size = new System.Drawing.Size(190, 29);
+            this.SNLength.Size = new System.Drawing.Size(213, 34);
             this.SNLength.Str = null;
             this.SNLength.Str1 = null;
             this.SNLength.Str2 = null;
@@ -365,12 +366,12 @@
             this.TSNLength.BackColor = System.Drawing.Color.White;
             this.TSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.TSNLength.ID = null;
-            this.TSNLength.Location = new System.Drawing.Point(172, 82);
+            this.TSNLength.Location = new System.Drawing.Point(194, 98);
             this.TSNLength.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.TSNLength.Name = "TSNLength";
             this.TSNLength.Negative = false;
             this.TSNLength.Power = null;
-            this.TSNLength.Size = new System.Drawing.Size(190, 29);
+            this.TSNLength.Size = new System.Drawing.Size(213, 34);
             this.TSNLength.Str = null;
             this.TSNLength.Str1 = null;
             this.TSNLength.Str2 = null;
@@ -380,27 +381,27 @@
             // 
             this.ma_softversion.AutoSize = true;
             this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_softversion.Location = new System.Drawing.Point(810, 47);
+            this.ma_softversion.Location = new System.Drawing.Point(911, 56);
             this.ma_softversion.Name = "ma_softversion";
-            this.ma_softversion.Size = new System.Drawing.Size(0, 27);
+            this.ma_softversion.Size = new System.Drawing.Size(0, 31);
             this.ma_softversion.TabIndex = 150;
             // 
             // label2
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(712, 47);
+            this.label2.Location = new System.Drawing.Point(801, 56);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(92, 27);
+            this.label2.Size = new System.Drawing.Size(110, 31);
             this.label2.TabIndex = 149;
             this.label2.Text = "软件版本";
             // 
             // Make_SeqProgramTransform
             // 
-            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(1127, 492);
+            this.ClientSize = new System.Drawing.Size(1268, 590);
             this.Controls.Add(this.ma_softversion);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.ChangeResult);
@@ -436,7 +437,7 @@
             this.Load += new System.EventHandler(this.Make_SeqProgramTransform_Load);
             this.SizeChanged += new System.EventHandler(this.序列烧录转换_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -140,22 +140,8 @@ namespace UAS_MES.Make
                                         }
                                         else
                                         {
-                                            //修改转换结果时，输入两次SN直接过站
-                                            if (dh.CheckExist("MakeSerial", "ms_sncode='" + code.Text + "' and ms_id='" + oMsid + "' and ms_beforesn is not null"))
-                                            {
-                                                step = 1;
-                                                TSN = code.Text;
-                                                //显示序列号
-                                                show_sncode.Text = TSN;
-                                                OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green, code);
-                                                ChangeResult.Enabled = false;
-                                                onlyPass = true;
-                                            }
-                                            else
-                                            {
-                                                OperateResult.AppendText(">>不存在该已转序列号:" + code.Text + "\n", Color.Red, code);
-                                                OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
-                                            }
+                                            OperateResult.AppendText(">>不存在该已转序列号:" + code.Text + "\n", Color.Red, code);
+                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
                                         }
                                     }
                                     else
@@ -177,8 +163,22 @@ namespace UAS_MES.Make
                                         else
                                         //不为空，进行过转换。不勾选修改结果，就不能再修改
                                         {
-                                            OperateResult.AppendText(">>序列号" + code.Text + "已经转换过\n", Color.Red,code);
-                                            OperateResult.AppendText("<<请重新输入TSN\n", Color.Black);
+                                            //修改转换结果时，输入两次SN直接过站
+                                            if (dh.CheckExist("MakeSerial", "ms_sncode='" + code.Text + "' and ms_id='" + oMsid + "' and ms_beforesn is not null"))
+                                            {
+                                                step = 1;
+                                                TSN = code.Text;
+                                                //显示序列号
+                                                show_sncode.Text = TSN;
+                                                OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green, code);
+                                                ChangeResult.Enabled = false;
+                                                onlyPass = true;
+                                            }
+                                            else
+                                            {
+                                                OperateResult.AppendText(">>序列号:" + code.Text + "错误\n", Color.Red, code);
+                                                OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
+                                            }
                                         }
                                     }
                                 }
@@ -719,5 +719,14 @@ namespace UAS_MES.Make
                 return false;
             }
         }
+
+        private void ChangeResult_CheckedChanged(object sender, EventArgs e)
+        {
+            if (ChangeResult.Checked)
+            {
+                //勾选的时候提示输入TSN
+                OperateResult.AppendText("<<请输入TSN号\n", Color.Black);
+            }
+        }
     }
 }

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

@@ -63,20 +63,20 @@
             // 
             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;
             // 
             // 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(733, 18);
+            this.pr_detail_label.Location = new System.Drawing.Point(825, 22);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.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 = "产品名称";
             // 
@@ -84,10 +84,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(409, 19);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(460, 23);
             this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode_label.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 = "产品编号";
             // 
@@ -95,10 +95,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(22, 537);
+            this.sncode_label.Location = new System.Drawing.Point(25, 644);
             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 = "录入框";
             // 
@@ -106,10 +106,10 @@
             // 
             this.beforeTransSNLength_checkBox.AutoSize = true;
             this.beforeTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(25, 101);
+            this.beforeTransSNLength_checkBox.Location = new System.Drawing.Point(28, 121);
             this.beforeTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.beforeTransSNLength_checkBox.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;
@@ -118,10 +118,10 @@
             // 
             this.afterTransSNLength_checkBox.AutoSize = true;
             this.afterTransSNLength_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(25, 142);
+            this.afterTransSNLength_checkBox.Location = new System.Drawing.Point(28, 170);
             this.afterTransSNLength_checkBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.afterTransSNLength_checkBox.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;
@@ -130,10 +130,10 @@
             // 
             this.beforeTransSNPre_checkBox.AutoSize = true;
             this.beforeTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(560, 99);
+            this.beforeTransSNPre_checkBox.Location = new System.Drawing.Point(630, 119);
             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;
@@ -142,10 +142,10 @@
             // 
             this.afterTransSNPre_checkBox.AutoSize = true;
             this.afterTransSNPre_checkBox.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(560, 141);
+            this.afterTransSNPre_checkBox.Location = new System.Drawing.Point(630, 169);
             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;
@@ -154,9 +154,9 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(20, 19);
+            this.label1.Location = new System.Drawing.Point(22, 23);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(92, 27);
+            this.label1.Size = new System.Drawing.Size(110, 31);
             this.label1.TabIndex = 93;
             this.label1.Text = "工单编号";
             // 
@@ -164,9 +164,9 @@
             // 
             this.ma_code.AutoSize = true;
             this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_code.Location = new System.Drawing.Point(121, 18);
+            this.ma_code.Location = new System.Drawing.Point(136, 22);
             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 = 95;
             this.ma_code.TextChanged += new System.EventHandler(this.ms_makecode_UserControlTextChanged);
             // 
@@ -174,9 +174,9 @@
             // 
             this.changenum.AutoSize = true;
             this.changenum.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.changenum.Location = new System.Drawing.Point(508, 64);
+            this.changenum.Location = new System.Drawing.Point(572, 77);
             this.changenum.Name = "changenum";
-            this.changenum.Size = new System.Drawing.Size(24, 27);
+            this.changenum.Size = new System.Drawing.Size(28, 31);
             this.changenum.TabIndex = 100;
             this.changenum.Text = "0";
             // 
@@ -184,18 +184,18 @@
             // 
             this.remain_qty.AutoSize = true;
             this.remain_qty.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.remain_qty.Location = new System.Drawing.Point(124, 63);
+            this.remain_qty.Location = new System.Drawing.Point(140, 76);
             this.remain_qty.Name = "remain_qty";
-            this.remain_qty.Size = new System.Drawing.Size(0, 27);
+            this.remain_qty.Size = new System.Drawing.Size(0, 31);
             this.remain_qty.TabIndex = 99;
             // 
             // PrintNum_label
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.PrintNum_label.Location = new System.Drawing.Point(409, 64);
+            this.PrintNum_label.Location = new System.Drawing.Point(460, 77);
             this.PrintNum_label.Name = "PrintNum_label";
-            this.PrintNum_label.Size = new System.Drawing.Size(52, 27);
+            this.PrintNum_label.Size = new System.Drawing.Size(62, 31);
             this.PrintNum_label.TabIndex = 98;
             this.PrintNum_label.Text = "计数";
             // 
@@ -203,9 +203,9 @@
             // 
             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(24, 64);
+            this.remain_qty_label.Location = new System.Drawing.Point(27, 77);
             this.remain_qty_label.Name = "remain_qty_label";
-            this.remain_qty_label.Size = new System.Drawing.Size(72, 27);
+            this.remain_qty_label.Size = new System.Drawing.Size(86, 31);
             this.remain_qty_label.TabIndex = 97;
             this.remain_qty_label.Text = "剩余数";
             // 
@@ -213,10 +213,10 @@
             // 
             this.ClearSn_code.Cursor = System.Windows.Forms.Cursors.Hand;
             this.ClearSn_code.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
-            this.ClearSn_code.Location = new System.Drawing.Point(373, 498);
-            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ClearSn_code.Location = new System.Drawing.Point(420, 598);
+            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.ClearSn_code.Name = "ClearSn_code";
-            this.ClearSn_code.Size = new System.Drawing.Size(21, 20);
+            this.ClearSn_code.Size = new System.Drawing.Size(24, 24);
             this.ClearSn_code.TabIndex = 141;
             this.ClearSn_code.TabStop = false;
             this.ClearSn_code.Click += new System.EventHandler(this.ReCall_Click);
@@ -225,10 +225,10 @@
             // 
             this.sn_code_label.AutoSize = true;
             this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_label.Location = new System.Drawing.Point(22, 495);
+            this.sn_code_label.Location = new System.Drawing.Point(25, 594);
             this.sn_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(72, 27);
+            this.sn_code_label.Size = new System.Drawing.Size(86, 31);
             this.sn_code_label.TabIndex = 139;
             this.sn_code_label.Text = "序列号";
             // 
@@ -236,14 +236,15 @@
             // 
             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(373, 534);
+            this.ChangeResult.Location = new System.Drawing.Point(420, 641);
             this.ChangeResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ChangeResult.Name = "ChangeResult";
             this.ChangeResult.Power = "ifspecial";
-            this.ChangeResult.Size = new System.Drawing.Size(114, 31);
+            this.ChangeResult.Size = new System.Drawing.Size(136, 35);
             this.ChangeResult.TabIndex = 146;
             this.ChangeResult.Text = "重新转换";
             this.ChangeResult.UseVisualStyleBackColor = true;
+            this.ChangeResult.CheckedChanged += new System.EventHandler(this.ChangeResult_CheckedChanged);
             // 
             // show_sncode
             // 
@@ -252,11 +253,11 @@
             this.show_sncode.Enabled = false;
             this.show_sncode.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.show_sncode.ID = null;
-            this.show_sncode.Location = new System.Drawing.Point(129, 495);
-            this.show_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.show_sncode.Location = new System.Drawing.Point(145, 594);
+            this.show_sncode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.show_sncode.Name = "show_sncode";
             this.show_sncode.Power = null;
-            this.show_sncode.Size = new System.Drawing.Size(212, 29);
+            this.show_sncode.Size = new System.Drawing.Size(238, 34);
             this.show_sncode.Str = null;
             this.show_sncode.Str1 = null;
             this.show_sncode.Str2 = null;
@@ -267,10 +268,10 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.pr_detail.Location = new System.Drawing.Point(831, 18);
-            this.pr_detail.MaximumSize = new System.Drawing.Size(178, 0);
+            this.pr_detail.Location = new System.Drawing.Point(935, 22);
+            this.pr_detail.MaximumSize = new System.Drawing.Size(200, 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 = 96;
             // 
             // ma_prodcode
@@ -278,30 +279,30 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_prodcode.Location = new System.Drawing.Point(512, 22);
+            this.ma_prodcode.Location = new System.Drawing.Point(576, 26);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(146, 0);
+            this.ma_prodcode.MaximumSize = new System.Drawing.Size(164, 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 = 94;
             // 
             // afterTransSNLength
             // 
             this.afterTransSNLength.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.afterTransSNLength.Location = new System.Drawing.Point(237, 139);
+            this.afterTransSNLength.Location = new System.Drawing.Point(267, 167);
             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.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(237, 97);
+            this.beforeTransSNLength.Location = new System.Drawing.Point(267, 116);
             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.Size = new System.Drawing.Size(250, 34);
             this.beforeTransSNLength.TabIndex = 89;
             this.beforeTransSNLength.Text = "0";
             // 
@@ -311,11 +312,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(773, 141);
+            this.afterTransSNPre.Location = new System.Drawing.Point(870, 169);
             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;
@@ -327,11 +328,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(773, 99);
+            this.beforeTransSNPre.Location = new System.Drawing.Point(870, 119);
             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;
@@ -340,10 +341,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.OperateResult.Location = new System.Drawing.Point(25, 183);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.OperateResult.Location = new System.Drawing.Point(28, 220);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(1081, 287);
+            this.OperateResult.Size = new System.Drawing.Size(1216, 344);
             this.OperateResult.TabIndex = 78;
             this.OperateResult.Text = "";
             // 
@@ -353,11 +354,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(129, 537);
-            this.sncode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.sncode.Location = new System.Drawing.Point(145, 644);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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;
@@ -369,10 +370,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(733, 63);
+            this.label2.Location = new System.Drawing.Point(825, 76);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(92, 27);
+            this.label2.Size = new System.Drawing.Size(110, 31);
             this.label2.TabIndex = 147;
             this.label2.Text = "软件版本";
             // 
@@ -380,16 +381,16 @@
             // 
             this.ma_softversion.AutoSize = true;
             this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_softversion.Location = new System.Drawing.Point(831, 63);
+            this.ma_softversion.Location = new System.Drawing.Point(935, 76);
             this.ma_softversion.Name = "ma_softversion";
-            this.ma_softversion.Size = new System.Drawing.Size(0, 27);
+            this.ma_softversion.Size = new System.Drawing.Size(0, 31);
             this.ma_softversion.TabIndex = 148;
             // 
             // 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, 584);
+            this.ClientSize = new System.Drawing.Size(1274, 701);
             this.Controls.Add(this.ma_softversion);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.ChangeResult);
@@ -419,14 +420,14 @@
             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 = " ";
             this.Load += new System.EventHandler(this.序列转换_Load);
             this.SizeChanged += new System.EventHandler(this.序列转换_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -124,21 +124,8 @@ namespace UAS_MES.Make
                                         }
                                         else
                                         {
-                                            //修改转换结果时，输入两次SN直接过站
-                                            if (dh.CheckExist("MakeSerial", "ms_sncode='" + sncode.Text + "' and ms_id='" + oMsId + "' and ms_beforesn is not null"))
-                                            {
-                                                bsncode = sncode.Text;
-                                                //显示序列号
-                                                show_sncode.Text = bsncode;
-                                                OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green, sncode);
-                                                ChangeResult.Enabled = false;
-                                                flag = true;
-                                            }
-                                            else
-                                            {
-                                                OperateResult.AppendText(">>不存在该已转序列号:" + sncode.Text + "\n", Color.Red, sncode);
-                                                OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
-                                            }
+                                            OperateResult.AppendText(">>不存在该已转序列号:" + sncode.Text + "\n", Color.Red, sncode);
+                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
                                         }
                                         break;
                                     case CheckState.Unchecked:
@@ -157,8 +144,21 @@ namespace UAS_MES.Make
                                         else
                                         //不为空，进行过转换。不勾选修改结果，就不能再修改
                                         {
-                                            OperateResult.AppendText(">>序列号" + sncode.Text + "已经转换过\n", Color.Red, sncode);
-                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
+                                            //修改转换结果时，输入两次SN直接过站
+                                            if (dh.CheckExist("MakeSerial", "ms_sncode='" + sncode.Text + "' and ms_id='" + oMsId + "' and ms_beforesn is not null"))
+                                            {
+                                                bsncode = sncode.Text;
+                                                //显示序列号
+                                                show_sncode.Text = bsncode;
+                                                OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green, sncode);
+                                                ChangeResult.Enabled = false;
+                                                flag = true;
+                                            }
+                                            else
+                                            {
+                                                OperateResult.AppendText(">>序列号:" + sncode.Text + "错误\n", Color.Red, sncode);
+                                                OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
+                                            }
                                         }
                                         break;
                                     default:
@@ -534,5 +534,14 @@ namespace UAS_MES.Make
             }
             return false;
         }
+
+        private void ChangeResult_CheckedChanged(object sender, EventArgs e)
+        {
+            if (ChangeResult.Checked)
+            {
+                //勾选的时候提示输入TSN
+                OperateResult.AppendText("<<请输入TSN号\n", Color.Black);
+            }
+        }
     }
 }