【次元EIS接口，测试过账接口已经过站不允许重新，条件调整】

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

@@ -335,7 +335,7 @@ public class StepWorkServiceImpl implements StepWorkService {
         if(Boolean.valueOf(remap.get("success").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());
+            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());
             if(StringUtil.hasText(mscode)){
                 return StepWorkApiResponse.successRsp(400, "【" + sncode + "】序列号工序【"+stepcode+"】已经过站，请勿重复过站!");
             }
@@ -371,7 +371,7 @@ public class StepWorkServiceImpl implements StepWorkService {
         Map<String, Object> remap = checkStep(macode, sccode.toString(), sncode.toString(), usercode,stepcode.toString());
         if (Boolean.valueOf(remap.get("success").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());
+            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());
             if(StringUtil.hasText(mscode)){
                 return StepWorkApiResponse.successRsp(400, "【" + sncode + "】序列号工序【"+stepcode+"】已经过站，请勿重复过站!");
             }