bpm接口打开工艺路线

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

@@ -373,13 +373,13 @@ public class AbnormalBillController {
             AbnormalRouterDto abnormalRouterDto = new AbnormalRouterDto();
             abnormalRouterDto.setSite(site);
             abnormalRouterDto.setItem(routerBpmVO.getItem());
-            List<AbnormalRouterDto> abnormalRouterDtoList = routerService.selectDisrouter(abnormalRouterDto);
+            List<AbnormalRouterDto> abnormalRouterDtoList = routerService.selectAllDisRouter(abnormalRouterDto);
             ArrayList<RouterBpmVO> routerBpmVOs = new ArrayList<>();
             for (AbnormalRouterDto routerDto : abnormalRouterDtoList) {
                 RouterBpmVO bpmVO = new RouterBpmVO();
                 bpmVO.setAbnormalNo(routerDto.getAbnormalNo());
                 bpmVO.setRouter(routerDto.getRouter());
-                bpmVO.setRouterType(routerDto.getRouterType());
+                bpmVO.setRouterType("C");
                 bpmVO.setItemDescription(routerDto.getItemDescription());
                 bpmVO.setItemRevision(routerDto.getRouterRevision());
                 bpmVO.setPbDescription(routerDto.getPbDescription());
@@ -387,7 +387,7 @@ public class AbnormalBillController {
                 bpmVO.setPbDescription(routerDto.getPbDescription());
                 bpmVO.setItem(routerDto.getItem());
                 bpmVO.setShopOrder(routerBpmVO.getShopOrder());
-                bpmVO.setSite(routerDto.getSite());
+                bpmVO.setSite(site);
                 bpmVO.setRouterBo(routerDto.getRouterBo());
                 RouterStep routerStep = new RouterStep();
                 routerStep.setRouterBo(routerDto.getRouterBo());

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java

@@ -595,9 +595,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             }
             return ;
         }
-        if(abnormalBill.getBpmSubmit().equals("false")) {
+        /*if(abnormalBill.getBpmSubmit().equals("false")) {
             this.anomalyCreatedAndSendMessage(abnormalBillMapper.selectById(abnormalBill.getHandle()), null);
-        }
+        }*/
     }
 
     @Override

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/RouterMapper.java

@@ -30,4 +30,7 @@ public interface RouterMapper extends BaseMapper<Router> {
    RouterStep findRepairOperation(@Param("site") String site, @Param("routerBo") String routerBo, @Param("stepId")  String stepId);
 
     List<AbnormalRouterDto> selectDisrouter(@Param("abnormalRouterDto")AbnormalRouterDto abnormalRouterDto);
+
+    List<AbnormalRouterDto> selectAllDisRouter(@Param("abnormalRouterDto")AbnormalRouterDto abnormalRouterDto);
+
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/RouterService.java

@@ -49,6 +49,8 @@ public interface RouterService extends IService<Router> {
 
     List<AbnormalRouterDto> selectDisrouter(AbnormalRouterDto abnormalRouterDto);
 
+    List<AbnormalRouterDto> selectAllDisRouter(AbnormalRouterDto abnormalRouterDto);
+
     /**
      * 放置图片
      * @param disRouter

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/RouterServiceImpl.java

@@ -281,6 +281,11 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
          return routerMapper.selectDisrouter(abnormalRouterDto);
     }
 
+    @Override
+    public List<AbnormalRouterDto> selectAllDisRouter(AbnormalRouterDto abnormalRouterDto) {
+        return routerMapper.selectAllDisRouter(abnormalRouterDto);
+    }
+
     @Override
     public void fileUpload(DisRouter disRouter,String routerBo,String stepId) {
         String user = CommonMethods.getUser();

meapi/src/main/resources/mapper/RouterMapper.xml

@@ -702,5 +702,21 @@
                 AND I.ITEM IS NOT NULL
 
     </select>
+    <select id="selectAllDisRouter" resultType="com.foreverwin.mesnac.meapi.dto.AbnormalRouterDto">
+        SELECT RS.HANDLE   ROUTER_BO,
+        RS.ROUTER,
+        RS.REVISION ROUTER_REVISION,
+        rs.ROUTER_TYPE,
+        substr(RS.ROUTER,0,length(RS.ROUTER) -2) ITEM
+        FROM ROUTER rs
+        WHERE
+        rs.SITE = #{abnormalRouterDto.site}
+        AND rs.ROUTER_TYPE = 'C'
+        AND rs.CURRENT_REVISION = 'true'
+        <if test="abnormalRouterDto.item !=null and abnormalRouterDto.item !=''">
+            AND  rs.ROUTER = #{abnormalRouterDto.item} || 'FX'
+        </if>
+
+    </select>
 
 </mapper>