单板测试修改

UAS_MES_JC/FunctionCode/Make/Make_SingleBoard.cs

@@ -120,7 +120,7 @@ namespace UAS_MES_NEW.Make
                     OperateResult.AppendText(">>" + SN.Text + "不在用料表中，不允许扫描\n", Color.Red);
                     return;
                 }
-                if (User.CurrentStepCode == "单板测试")
+                if (User.CurrentStepCode == "单板上料")
                 {
                     if (dh.CheckExist("singleboard", "sb_sncode='" + SN.Text + "'"))
                     {
@@ -131,7 +131,7 @@ namespace UAS_MES_NEW.Make
                     {
                         dh.ExecuteSql("insert into singleboard(SB_ID, SB_MAKECODE, SB_SNCODE, SB_INDATE, SB_NEXTSTEPCODE, SB_BADTIMS, SB_STATUS,sb_stepcode)" +
                             "values(singleboard_seq.nextval,'" + ma_code.Text + "','" + SN.Text + "',sysdate,'单板测试',0,'1','单板上料')", "insert");
-                    }   
+                    }
                 }
                 //if (User.CurrentStepCode == "刷三防漆")
                 //{

UAS_MES_JC/FunctionCode/Make/Make_SingleBoard2.cs

@@ -112,13 +112,9 @@ namespace UAS_MES_NEW.Make
                         checksn = true;
                     }
                 }
-                if (User.CurrentStepCode.Contains("单板测试") || User.CurrentStepCode.Contains("刷三防漆"))
+                if (!User.CurrentStepCode.Contains("刷三防漆"))
                 {
-
-                }
-                else
-                {
-                    OperateResult.AppendText(">>单板采集界面，请登录【单板测试】或【刷三防漆】资源\n", Color.Red);
+                    OperateResult.AppendText(">>单板采集界面，请登录【刷三防漆】资源\n", Color.Red);
                     return;
                 }
                 if (!checksn)
@@ -151,6 +147,11 @@ namespace UAS_MES_NEW.Make
                             OperateResult.AppendText(">>" + SN.Text + "测试不良不允许采集，请先进行维修\n", Color.Red);
                             return;
                         }
+                        if (sb_status == "2")
+                        {
+                            OperateResult.AppendText(">>" + SN.Text + "已完工\n", Color.Red);
+                            return;
+                        }
                         if (SB_NEXTSTEPCODE == User.CurrentStepCode)
                         {
                             dh.ExecuteSql("update singleboard set sb_nextstepcode='',sb_status=2 where sb_sncode='" + SN.Text + "'", "update"); ;