Преглед на файлове

【慧眼,测试工序过站,增加限制,转号后的SN不能与原SN一致】

xiaost преди 1 ден
родител
ревизия
971ec38608
променени са 1 файла, в които са добавени 10 реда и са изтрити 0 реда
  1. 10 0
      src/main/java/com/uas/eis/serviceImpl/StepWorkServiceImpl.java

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

@@ -338,6 +338,16 @@ 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());