【慧眼，测试工序 如果是不良，就只掉不良过站，不调用转号】

src/main/java/com/uas/eis/serviceImpl/StepWorkServiceImpl.java

@@ -267,7 +267,16 @@ public class StepWorkServiceImpl implements StepWorkService {
             }
             //将不良的序列号的状态码设为3
             baseDao.execute("update makeserial set ms_status='3' where ms_sncode=? and ms_makecode=?",sncode,macode);
-        }/*else if("PASS".equals(result) && StringUtil.hasText(failureCode)){ //强制良品也有不良代码的
+            stepPassed(macode, sccode, sncode, usercode,  "NG");
+        }else{
+            //转号：CS_SNCHANGEANDBURN
+            if(StringUtil.hasText(extendSequenceNumber) && "PASS".equals(result) ){
+                snChange(macode,sccode,sncode,extendSequenceNumber.toString(),usercode);
+            }else {
+                stepPassed(macode, sccode, sncode, usercode, "PASS".equals(result) ? "OK" : "NG");
+            }
+        }
+        /*else if("PASS".equals(result) && StringUtil.hasText(failureCode)){ //强制良品也有不良代码的
             baseDao.execute("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode,mb_sourcecode,mb_badcode,mb_badtable,mb_bgcode,mb_soncode,mb_status)" +
                     " select makebad_seq.nextval,ma_code,ms_code,ms_sncode,'EIS对接',sysdate,?,?,?,'',?,sp_soncode,-1 from make left join makeserial on ms_makecode=ma_code left join " +
                     " stepproduct on sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode=? and ms_makecode=?",stepcode,sccode,failureCode,BgCode,sncode,macode);
@@ -286,12 +295,7 @@ public class StepWorkServiceImpl implements StepWorkService {
                 }
             }
         }*/
-        //转号：CS_SNCHANGEANDBURN
-        if(StringUtil.hasText(extendSequenceNumber) && "PASS".equals(result) ){
-            snChange(macode,sccode,sncode,extendSequenceNumber.toString(),usercode);
-        }else {
-            stepPassed(macode, sccode, sncode, usercode, "PASS".equals(result) ? "OK" : "NG");
-        }
+
     }
 
     //记录日志