【慧眼EIS，测试工序接口调整，返修特定工单：1、不需要转号，2、去掉限制转号和原号不能一致的限制】

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

@@ -284,8 +284,8 @@ public class StepWorkServiceImpl implements StepWorkService {
                     }
                 }
             }
-           //转号：CS_SNCHANGEANDBURN
-           if (StringUtil.hasText(extendSequenceNumber) && "PASS".equals(result)) {
+           //转号：CS_SNCHANGEANDBURN,两个号一样不需要转号，实际就是返修工单m不需要转号
+           if (StringUtil.hasText(extendSequenceNumber) && !sncode.equals(extendSequenceNumber) && "PASS".equals(result)) {
                snChange(macode, sccode, sncode, extendSequenceNumber.toString(), usercode);
            } else {
                stepPassed(macode, sccode, sncode, usercode, "PASS".equals(result) ? "OK" : "NG");
@@ -337,20 +337,20 @@ public class StepWorkServiceImpl implements StepWorkService {
                 throw new ApiStepWorkException(new StepWorkApiResult(false, 400, "测试不良代码：" + failureCode + "在MES系统不存在!"));
             }
         }*/
-        //如果有转号 map.get("extendSequenceNumber")，限制转号跟原来的要不一样，判断前6位
-        if(StringUtil.hasText(map.get("extendSequenceNumber"))
-                && ( sncode.equals(map.get("extendSequenceNumber"))
-                    || (sncode.toString().length()>6 && map.get("extendSequenceNumber").toString().length()>6
-                           && sncode.toString().startsWith(map.get("extendSequenceNumber").toString().substring(0, Math.min(map.get("extendSequenceNumber").toString().length(),6))))
-                   )
-         ){
-            return StepWorkApiResponse.failRsp(400,"转号(extendSequenceNumber)【"+map.get("extendSequenceNumber")+"】" +
-                    " 和产品序列号（sequenceNumber)【"+sncode+"】不能一样！");
-        }
         String usercode = String.valueOf(request.getSession().getAttribute("usercode"));
         //工序校验
         Map<String,Object> remap =  checkStep(macode,sccode.toString(),sncode.toString(),usercode,stepcode.toString());
         if(Boolean.valueOf(remap.get("success").toString())){
+            //指定返修：2025120011，不需要校验，如果有转号 map.get("extendSequenceNumber")，限制转号跟原来的要不一样，判断前6位
+            if(!"2025120011".equals(remap.get("macode").toString()) && StringUtil.hasText(map.get("extendSequenceNumber"))
+                    && (sncode.equals(map.get("extendSequenceNumber"))
+                        || (sncode.toString().length()>6 && map.get("extendSequenceNumber").toString().length()>6
+                        && sncode.toString().startsWith(map.get("extendSequenceNumber").toString().substring(0, Math.min(map.get("extendSequenceNumber").toString().length(),6))))
+                       )
+            ){
+                return StepWorkApiResponse.failRsp(400,"转号(extendSequenceNumber)【"+map.get("extendSequenceNumber")+"】" +
+                        " 和产品序列号（sequenceNumber)【"+sncode+"】不能一样！");
+            }
             //工序保存测试数据并且过站
             //刚采集过当前工序，不允许再次采集
             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());