修改测试采集BUG

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -234,26 +234,30 @@ namespace UAS_MES.Make
 
         private void RepairComplete_Click(object sender, EventArgs e)
         {
-            int RejectNum = int.Parse(dh.getFieldDataByCondition("makebad", "count(0) cn", "mb_sncode='" + GetSNCode.Text + "' and mb_status not in (1,-1)").ToString());
-            if (RejectNum > 0)
-                OperatResult.AppendText(">>维修结果必须为已维修或无不良\n", Color.Red);
-            else
+            //
+            if (dh.CheckExist("makeserial", "ms_status=3 and ms_sncode='" + ms_sncode.Text + "'"))
             {
-                dt = (DataTable)dh.ExecuteSql("select cr_id from craft where cr_statuscode='AUDITED' and cr_code='" + cr_code.Text + "'", "select");
-                if (dt.Rows.Count == 0)
-                    OperatResult.AppendText(">>回流工序不存在\n", Color.Red);
+                int RejectNum = int.Parse(dh.getFieldDataByCondition("makebad", "count(0) cn", "mb_sncode='" + GetSNCode.Text + "' and mb_status not in (1,-1)").ToString());
+                if (RejectNum > 0)
+                    OperatResult.AppendText(">>维修结果必须为已维修或无不良\n", Color.Red);
                 else
                 {
-                    string cr_id = dt.Rows[0]["cr_id"].ToString();
-                    dt = (DataTable)dh.ExecuteSql("select cd_ifinput from craftdetail left join step on st_code=cd_stepcode where cd_crid='" + cr_id + "' and cd_stepcode='" + cd_stepcode.Text + "' and st_statuscode='AUDITED'", "select");
+                    dt = (DataTable)dh.ExecuteSql("select cr_id from craft where cr_statuscode='AUDITED' and cr_code='" + cr_code.Text + "'", "select");
                     if (dt.Rows.Count == 0)
-                        OperatResult.AppendText(">>回流工序不在回流工艺中\n", Color.Red);
+                        OperatResult.AppendText(">>回流工序不存在\n", Color.Red);
                     else
                     {
-                        dh.UpdateByCondition("makeserial", "ms_nextstepcode='" + cd_stepcode.Text + "',ms_craftcode='" + cr_code.Text + "',ms_stepcode='" + User.CurrentStepCode + "',ms_status=1", "ms_sncode='" + ms_sncode.Text + "'");
-                        dh.ExecuteSql(insert_makeprocess.Replace("#", "完成维修"), "insert", ms_sncode.Text, User.CurrentStepCode);
-                        OperatResult.AppendText(">>" + ms_sncode.Text + " 序列号回流成功\n", Color.Green);
-                        GetSNCode.Clear();
+                        string cr_id = dt.Rows[0]["cr_id"].ToString();
+                        dt = (DataTable)dh.ExecuteSql("select cd_ifinput from craftdetail left join step on st_code=cd_stepcode where cd_crid='" + cr_id + "' and cd_stepcode='" + cd_stepcode.Text + "' and st_statuscode='AUDITED'", "select");
+                        if (dt.Rows.Count == 0)
+                            OperatResult.AppendText(">>回流工序不在回流工艺中\n", Color.Red);
+                        else
+                        {
+                            dh.UpdateByCondition("makeserial", "ms_nextstepcode='" + cd_stepcode.Text + "',ms_craftcode='" + cr_code.Text + "',ms_stepcode='" + User.CurrentStepCode + "',ms_status=1", "ms_sncode='" + ms_sncode.Text + "'");
+                            dh.ExecuteSql(insert_makeprocess.Replace("#", "完成维修"), "insert", ms_sncode.Text, User.CurrentStepCode);
+                            OperatResult.AppendText(">>" + ms_sncode.Text + " 序列号回流成功\n", Color.Green);
+                            GetSNCode.Clear();
+                        }
                     }
                 }
             }
@@ -352,7 +356,7 @@ namespace UAS_MES.Make
                 }
                 else OperatResult.AppendText(">>必须选择不良原因\n", Color.Red);
             }
-            else OperatResult.AppendText(">>序列号错误，不存在或者不处于维修状态\n", Color.Red);
+            else OperatResult.AppendText(">>" + GetSNCode.Text + "序列号错误，不存在或者不处于维修状态\n", Color.Red);
         }
 
         private void SaveBadLocation_Click(object sender, EventArgs e)
@@ -373,7 +377,7 @@ namespace UAS_MES.Make
                 }
                 else OperatResult.AppendText(">>不良位置不能为空\n", Color.Red);
             }
-            else OperatResult.AppendText(">>序列号错误，不存在或者不处于维修状态\n", Color.Red);
+            else OperatResult.AppendText(">>" + GetSNCode.Text + "序列号错误，不存在或者不处于维修状态\n", Color.Red);
         }
 
         private void mbl_loc_TextChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -33,6 +33,9 @@ namespace UAS_MES.Make
         //用于保存是否之前输入的ms_sncode
         string ms_sncode1;
 
+        string oMakeCode = "";
+        string oMSID = "";
+
         LogStringBuilder sql = new LogStringBuilder();
 
         AutoSizeFormClass asc = new AutoSizeFormClass();
@@ -164,8 +167,7 @@ namespace UAS_MES.Make
                 bool ifFirst;
                 if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
                 {
-                    string oMakeCode = "";
-                    string oMSID = "";
+
                     if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
                     {
                         dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,pr_detail,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
@@ -182,18 +184,15 @@ namespace UAS_MES.Make
                             string stepcode = dt.Rows[0]["ms_stepcode"].ToString();
                             if (stepcode == User.CurrentStepCode && (status == "1" || status == "2"))
                             {
-                                OperateResult.AppendText(">>"+ ms_sncode.Text+ " 序列号已执行过" + User.CurrentStepCode + "工序,采集结果为良品\n", Color.Red);
+                                OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号已执行过" + User.CurrentStepCode + "工序,采集结果为良品\n", Color.Red);
                                 return;
                             }
                         }
                         SetCollectResult();
                     }
-                    else
-                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                    else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                 }
-                else
-                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                ms_sncode.Text = "";
+                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
             }
         }
 
@@ -229,6 +228,7 @@ namespace UAS_MES.Make
             }
         }
 
+
         /// <summary>
         /// 加载不良代码的ListView的信息
         /// </summary>
@@ -336,8 +336,7 @@ namespace UAS_MES.Make
             }
             if (GoodProduct.Checked)
             {
-                SetTestPass();
-                LoadCollectedNum();
+                ms_code_KeyDown(sender,new KeyEventArgs(Keys.Enter));
             }
             else if (Reject.Checked)
             {
@@ -432,7 +431,7 @@ namespace UAS_MES.Make
                     {
                         if (ChoosedRejectList.Items[i].ListView.Items[i].SubItems[2].Text == bc_code.Text)
                         {
-                            OperateResult.AppendText(">>已添加过不良代码"+bc_code.Text+"\n", Color.Red);
+                            OperateResult.AppendText(">>已添加过不良代码" + bc_code.Text + "\n", Color.Red);
                             return;
                         }
                     }
@@ -442,7 +441,7 @@ namespace UAS_MES.Make
                         lvi.SubItems.Add(dt.Rows[0][j].ToString());
                     ChoosedRejectList.Items.Add(lvi);
                 }
-                else OperateResult.AppendText(">>不良代码"+bc_code.Text+"不存在\n", Color.Red);
+                else OperateResult.AppendText(">>不良代码" + bc_code.Text + "不存在\n", Color.Red);
             }
         }