【慧眼EIS，测试保存数据接口,良品不能再测试，不良品可以再次采集成良品】

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

@@ -269,6 +269,21 @@ public class StepWorkServiceImpl implements StepWorkService {
            baseDao.execute("update makeserial set ms_status='3' where ms_sncode=? and ms_makecode=?", sncode, macode);
            stepPassed(macode, sccode, sncode, usercode, "NG");
        } else {
+           //不良采集为良品是更新
+             if (msstepcode!=null && msstepcode.toString().equals(stepcode) && result == "PASS") {
+                Object[] ob = baseDao.getFieldsDataByCondition("makeserial", "ms_status,ms_craftcode,ms_prodcode", "ms_sncode='" + sncode + "' and ms_makecode='" + macode + "'");
+                if (ob!=null){
+                    String ms_status =ob[0].toString();
+                    String ms_craftcode= ob[1].toString();
+                    String ms_prodcode = ob[2].toString();
+                    if (ms_status == "3") {
+                        String nextstepcode =baseDao.getFieldDataByCondition("craft left join  craftdetail on cr_id=cd_crid ", "cd_nextstepcode", "cr_code='" + ms_craftcode + "' and cr_prodcode='" + ms_prodcode + "' and cd_stepcode='" + stepcode + "'").toString();
+                        baseDao.updateByCondition("makeserial", "ms_status=1,ms_nextstepcode='" + nextstepcode + "'", "ms_sncode='" + sncode + "' and ms_makecode='" + macode + "'");
+                        baseDao.updateByCondition("makebad", "mb_status=-1", "mb_sncode='" + sncode + "' and mb_makecode='" + macode + "'");
+                        baseDao.updateByCondition("MAKEBADCOUNT_USING","mbc_status=-1","mbc_sncode='"+sncode+"' and mbc_stepcode='"+stepcode+"' and nvl(mbc_status,0)=0");
+                    }
+                }
+            }
            //转号：CS_SNCHANGEANDBURN
            if (StringUtil.hasText(extendSequenceNumber) && "PASS".equals(result)) {
                snChange(macode, sccode, sncode, extendSequenceNumber.toString(), usercode);
@@ -276,27 +291,6 @@ public class StepWorkServiceImpl implements StepWorkService {
                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);
-        }*/
-        //不良采集为良品是更新 ,不支持更新
-        /*if (msstepcode!=null && msstepcode.toString().equals(stepcode) && isok == "PASS") {
-            Object[] ob = baseDao.getFieldsDataByCondition("makeserial", "ms_status,ms_craftcode,ms_prodcode", "ms_sncode='" + sncode + "' and ms_makecode='" + macode + "'");
-            if (ob!=null){
-                String ms_status =ob[0].toString();
-                String ms_craftcode= ob[1].toString();
-                String ms_prodcode = ob[2].toString();
-                if (ms_status == "3") {
-                    String nextstepcode =baseDao.getFieldDataByCondition("craft left join  craftdetail on cr_id=cd_crid ", "cd_nextstepcode", "cr_code='" + ms_craftcode + "' and cr_prodcode='" + ms_prodcode + "' and cd_stepcode='" + stepcode + "'").toString();
-                    baseDao.updateByCondition("makeserial", "ms_status=1,ms_nextstepcode='" + nextstepcode + "'", "ms_sncode='" + sncode + "' and ms_makecode='" + macode + "'");
-                    baseDao.updateByCondition("makebad", "mb_status=-1", "mb_sncode='" + sncode + "' and mb_makecode='" + macode + "'");
-                }
-            }
-        }*/
-
     }
 
     //记录日志
@@ -359,10 +353,10 @@ public class StepWorkServiceImpl implements StepWorkService {
         if(Boolean.valueOf(remap.get("success").toString())){
             //工序保存测试数据并且过站
             //刚采集过当前工序，不允许再次采集
-           /* String mscode = baseDao.getJdbcTemplate().queryForObject("select wm_concat(ms_sncode) from source left join makeserial on ms_stepcode=sc_stepcode where ms_id=? and sc_code=?",String.class,remap.get("msid"),stepcode.toString());
+            String mscode = baseDao.getJdbcTemplate().queryForObject("select wm_concat(ms_sncode) from source left join makeserial on ms_stepcode=sc_stepcode where ms_id=? and sc_code=? and nvl(ms_nextstepcode,' ')<>' ' and ms_status=1",String.class,remap.get("msid"),stepcode.toString());
             if(StringUtil.hasText(mscode)){
                 return StepWorkApiResponse.successRsp(400, "【" + sncode + "】序列号工序【"+stepcode+"】已经过站，请勿重复过站!");
-            }*/
+            }
             saveTestDataAndPassed(remap.get("macode").toString(),stepcode.toString(),sccode.toString(),sncode.toString(),
                     isok.toString(),failureCode.toString(),map.get("isinput"),map.get("machineTestData"),
                     map.get("extendSequenceNumber"),usercode);