序列烧录改命名空间，修改bug

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(806, 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(187, 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(187, 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(578, 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(578, 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(948, 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;
             }
         }