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

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

@@ -109,6 +109,7 @@ public class StepWorkServiceImpl implements StepWorkService {
         }else{
             map.put("success",true);
             map.put("macode",list.get(0));
+            map.put("msid",list.get(1));
         }
         return map;
 
@@ -313,6 +314,11 @@ 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());
+            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);
@@ -344,6 +350,11 @@ public class StepWorkServiceImpl implements StepWorkService {
         String usercode = String.valueOf(request.getSession().getAttribute("usercode"));
         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());
+            if(StringUtil.hasText(mscode)){
+                return StepWorkApiResponse.successRsp(400, "【" + sncode + "】序列号工序【"+stepcode+"】已经过站，请勿重复过站!");
+            }
             stepPassed(remap.get("macode").toString(), stepcode.toString(), sncode.toString(), usercode, "OK");
             return StepWorkApiResponse.successRsp(200, "【" + sncode + "】产品序列号过站成功!");
         } else {