Parcourir la source

【慧眼EIS-测试过站,校验原号和转号是否一致,增加限制条件,只有传过来的eventResult参数值是良品PASS的时候才校验,不良品的时候不需要检验】

xiaost il y a 1 semaine
Parent
commit
751a5e61d3

+ 2 - 0
src/main/java/com/uas/eis/serviceImpl/StepWorkServiceImpl.java

@@ -366,11 +366,13 @@ public class StepWorkServiceImpl implements StepWorkService {
         Map<String,Object> remap =  checkStep(macode,sccode.toString(),sncode.toString(),usercode,stepcode.toString());
         Map<String,Object> remap =  checkStep(macode,sccode.toString(),sncode.toString(),usercode,stepcode.toString());
         if(Boolean.valueOf(remap.get("success").toString())){
         if(Boolean.valueOf(remap.get("success").toString())){
             //指定返修:2025120011,不需要校验,如果有转号 map.get("extendSequenceNumber"),限制转号跟原来的要不一样,判断前6位
             //指定返修:2025120011,不需要校验,如果有转号 map.get("extendSequenceNumber"),限制转号跟原来的要不一样,判断前6位
+            //增加并且结果是良品的时候才需要校验
             if(!"2025120011".equals(remap.get("macode").toString()) && StringUtil.hasText(map.get("extendSequenceNumber"))
             if(!"2025120011".equals(remap.get("macode").toString()) && StringUtil.hasText(map.get("extendSequenceNumber"))
                     && (sncode.equals(map.get("extendSequenceNumber"))
                     && (sncode.equals(map.get("extendSequenceNumber"))
                         || (sncode.toString().length()>6 && map.get("extendSequenceNumber").toString().length()>6
                         || (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))))
                         && sncode.toString().startsWith(map.get("extendSequenceNumber").toString().substring(0, Math.min(map.get("extendSequenceNumber").toString().length(),6))))
                        )
                        )
+                    && "PASS".equals(isok)
             ){
             ){
                 return StepWorkApiResponse.failRsp(400,"转号(extendSequenceNumber)【"+map.get("extendSequenceNumber")+"】" +
                 return StepWorkApiResponse.failRsp(400,"转号(extendSequenceNumber)【"+map.get("extendSequenceNumber")+"】" +
                         " 和产品序列号(sequenceNumber)【"+sncode+"】不能一样!");
                         " 和产品序列号(sequenceNumber)【"+sncode+"】不能一样!");