update 获取工艺路线工序步骤重复校验

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

@@ -19,6 +19,8 @@ import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
 import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.mesnac.dispatch.model.SfcDispatch;
+import com.foreverwin.mesnac.dispatch.service.SfcDispatchService;
 import com.foreverwin.mesnac.meapi.dto.AbnormalRouterDto;
 import com.foreverwin.mesnac.meapi.dto.RouterStepDto;
 import com.foreverwin.mesnac.meapi.model.RouterStep;
@@ -28,6 +30,7 @@ import com.foreverwin.mesnac.meapi.service.RouterStepService;
 import com.foreverwin.mesnac.meapi.util.StringUtils;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
+import com.foreverwin.modular.core.util.SpringUtil;
 import com.sap.me.frame.service.CommonMethods;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -392,6 +395,20 @@ public class AbnormalBillController {
                 RouterStep routerStep = new RouterStep();
                 routerStep.setRouterBo(routerDto.getRouterBo());
                 List<RouterStepDto> routerOperationByRouterBo = routerStepService.findRouterOperationByRouterBo(site, routerDto.getRouterBo());
+                //判断当前SFC是否工序步骤标识重复
+                if (StringUtil.notBlank(routerBpmVO.getSfc())){
+                    List<SfcDispatch> sfcDispatchList = SpringUtil.getBean(SfcDispatchService.class).findSfcDispatch(site, routerBpmVO.getSfc(), null, null);
+                    for (SfcDispatch sfcDispatch : sfcDispatchList) {
+                        for (RouterStepDto routerStepDto : routerOperationByRouterBo) {
+                            if (sfcDispatch.getStepId().equals(routerStepDto.getStepId())){
+                                //保存操作日志
+                                StringUtil.saveOperLog("BPM获取工艺路线接口,SFC："  + routerBpmVO.getSfc(),"bpmGetRouting",
+                                        routerBpmVO.toString(),null,"此产品条码工序步骤标识重复：" + routerBpmVO.getSfc() + "，请重新出方案！");
+                                return new ResultVo(ResultCode.FAILED,"此SFC产品条码工序步骤标识重复：" + routerBpmVO.getSfc() + "，请重新出方案！");
+                            }
+                        }
+                    }
+                }
                 bpmVO.setRouterStep(routerOperationByRouterBo);
                 routerBpmVOs.add(bpmVO);
             }