update bpm获取工艺路线

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java

@@ -39,10 +39,10 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
+import java.util.*;
 import java.util.ArrayList;
-import java.util.ArrayList;
+import java.util.stream.Collectors;
-import java.util.List;
+import java.util.stream.IntStream;
-import java.util.Map;
 
 /**
  *
@@ -379,6 +379,7 @@ public class AbnormalBillController {
             List<AbnormalRouterDto> abnormalRouterDtoList = routerService.selectAllDisRouter(abnormalRouterDto);
             ArrayList<RouterBpmVO> routerBpmVOs = new ArrayList<>();
             for (AbnormalRouterDto routerDto : abnormalRouterDtoList) {
+                Boolean isStepUsed = false;
                 RouterBpmVO bpmVO = new RouterBpmVO();
                 bpmVO.setAbnormalNo(routerDto.getAbnormalNo());
                 bpmVO.setRouter(routerDto.getRouter());
@@ -398,19 +399,19 @@ public class AbnormalBillController {
                 //判断当前SFC是否工序步骤标识重复
                 if (StringUtil.notBlank(routerBpmVO.getSfc())){
                     List<SfcDispatch> sfcDispatchList = SpringUtil.getBean(SfcDispatchService.class).findSfcDispatch(site, routerBpmVO.getSfc(), null, null);
-                    for (SfcDispatch sfcDispatch : sfcDispatchList) {
+                    List<String> sfcDispatchStepList = sfcDispatchList.stream().map(SfcDispatch::getStepId).collect(Collectors.toList());
-                        for (RouterStepDto routerStepDto : routerOperationByRouterBo) {
+                    List<String> routerStepList = routerOperationByRouterBo.stream().map(RouterStepDto::getStepId).collect(Collectors.toList());
-                            if (sfcDispatch.getStepId().equals(routerStepDto.getStepId())){
+                    isStepUsed = IntStream.range(0, Math.min(sfcDispatchStepList.size(), routerStepList.size()))
-                                //保存操作日志
+                            .anyMatch(i -> sfcDispatchStepList.get(i).equals(routerStepList.get(i)));
-                                StringUtil.saveOperLog("BPM获取工艺路线接口,SFC："  + routerBpmVO.getSfc(),"bpmGetRouting",
+                }
-                                        routerBpmVO.toString(),null,"此产品条码工序步骤标识重复：" + routerBpmVO.getSfc() + "，请重新出方案！");
+                if (!isStepUsed){
-                                return new ResultVo(ResultCode.FAILED,"此SFC产品条码工序步骤标识重复：" + routerBpmVO.getSfc() + "，请重新出方案！");
+                    bpmVO.setRouterStep(routerOperationByRouterBo);
-                            }
+                    routerBpmVOs.add(bpmVO);
-                        }
+                }else {
-                    }
+                    //保存操作日志
+                    StringUtil.saveOperLog("BPM获取工艺路线接口,SFC："  + routerBpmVO.getSfc(),"bpmGetRouting",
+                            routerBpmVO.toString(),null,"此产品条码工序步骤标识重复：" + routerBpmVO.getSfc() + "，请重新出方案！");
                 }
-                bpmVO.setRouterStep(routerOperationByRouterBo);
-                routerBpmVOs.add(bpmVO);
             }
             return new ResultVo(ResultCode.SUCCESS,routerBpmVOs);
         }catch(Exception e){