慧眼EIS - 调整工序作业接口,已经过站的不允许重复过调整

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

@@ -242,8 +242,8 @@ public class StepWorkServiceImpl implements StepWorkService {
                     " 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") {
+        //不良采集为良品是更新 ,不支持更新
+        /*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();
@@ -255,7 +255,7 @@ public class StepWorkServiceImpl implements StepWorkService {
                     baseDao.updateByCondition("makebad", "mb_status=-1", "mb_sncode='" + sncode + "' and mb_makecode='" + macode + "'");
                 }
             }
-        }
+        }*/
         //转号：CS_SNCHANGEANDBURN
         if(StringUtil.hasText(extendSequenceNumber)){
             snChange(macode,stepcode,sncode,extendSequenceNumber.toString(),usercode);
@@ -315,7 +315,7 @@ public class StepWorkServiceImpl implements StepWorkService {
         if(Boolean.valueOf(remap.get("success").toString())){
             //工序保存测试数据并且过站
             //刚采集过当前工序，不允许再次采集
-            String mscode = baseDao.getJdbcTemplate().queryForObject("select ms_sncode from makeserial where ms_id=? and ms_stepcode=?",String.class,remap.get("msid"),stepcode.toString());
+            String mscode = baseDao.getJdbcTemplate().queryForObject("select wm_concat(ms_sncode) from makeserial where ms_id=? and ms_stepcode=?",String.class,remap.get("msid"),stepcode.toString());
             if(StringUtil.hasText(mscode)){
                 return StepWorkApiResponse.successRsp(400, "【" + sncode + "】序列号工序【"+stepcode+"】已经过站，请勿重复过站!");
             }
@@ -351,7 +351,7 @@ public class StepWorkServiceImpl implements StepWorkService {
         Map<String, Object> remap = checkStep(macode, stepcode.toString(), sncode.toString(), usercode);
         if (Boolean.valueOf(remap.get("success").toString())) {
             //刚采集过当前工序，不允许再次采集
-            String mscode = baseDao.getJdbcTemplate().queryForObject("select ms_sncode from makeserial where ms_id=? and ms_stepcode=?",String.class,remap.get("msid"),stepcode.toString());
+            String mscode = baseDao.getJdbcTemplate().queryForObject("select  wm_concat(ms_sncode) from makeserial where ms_id=? and ms_stepcode=?",String.class,remap.get("msid"),stepcode.toString());
             if(StringUtil.hasText(mscode)){
                 return StepWorkApiResponse.successRsp(400, "【" + sncode + "】序列号工序【"+stepcode+"】已经过站，请勿重复过站!");
             }