Bläddra i källkod

【慧眼,测试工序特殊处理,工单:511-251127026全部良品转号】

xiaost 1 dag sedan
förälder
incheckning
a21f9533db
1 ändrade filer med 27 tillägg och 21 borttagningar
  1. 27 21
      src/main/java/com/uas/eis/serviceImpl/StepWorkServiceImpl.java

+ 27 - 21
src/main/java/com/uas/eis/serviceImpl/StepWorkServiceImpl.java

@@ -255,27 +255,33 @@ public class StepWorkServiceImpl implements StepWorkService {
 
        Object msstepcode = baseDao.getFieldDataByCondition("Makeserial", "ms_stepcode", "ms_sncode='" + sncode + "' and ms_makecode='" + macode + "'");
        Map<Object, Object> rmap = new HashMap<>();
-        if("FAIL".equals(result) && StringUtil.hasText(failureCode)){
-            //将历史的不良记录更新状态
-            baseDao.execute("update makebad set mb_status=-1 where mb_sncode=? and mb_makecode=? and mb_stepcode=? and mb_status=0",sncode,macode);
-            //多个不良代码是用逗号分割的
-            String[] badcode = failureCode.split(",");
-            for (String item : badcode) {
-                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,0 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,item,BgCode,sncode,macode);
-            }
-            //将不良的序列号的状态码设为3
-            baseDao.execute("update makeserial set ms_status='3' where ms_sncode=? and ms_makecode=?",sncode,macode);
-            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");
-            }
-        }
+       if(macode.equals("511-251127026")){
+           if(StringUtil.hasText(extendSequenceNumber) ){
+               snChange(macode,sccode,sncode,extendSequenceNumber.toString(),usercode);
+           }
+       }else {
+           if ("FAIL".equals(result) && StringUtil.hasText(failureCode)) {
+               //将历史的不良记录更新状态
+               baseDao.execute("update makebad set mb_status=-1 where mb_sncode=? and mb_makecode=? and mb_stepcode=? and mb_status=0", sncode, macode);
+               //多个不良代码是用逗号分割的
+               String[] badcode = failureCode.split(",");
+               for (String item : badcode) {
+                   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,0 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, item, BgCode, sncode, macode);
+               }
+               //将不良的序列号的状态码设为3
+               baseDao.execute("update makeserial set ms_status='3' where ms_sncode=? and ms_makecode=?", sncode, macode);
+               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 " +