调式销售订单流程

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -3878,6 +3878,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             bv.setTaskDefKey(busSalesOrder.get().getNodeId());
             bv.setComment("重新提交");
             bv.setInstanceId(dto.getProcInsId());
+            //流程定义id
+            bv.setModelId(busSalesOrder.get().getProcDefId());
             ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
             AppOrderDetailsVo vo = resultBean.getData();
             if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
@@ -4135,6 +4137,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         Map<String, Object> variables = getOrderMap(busSalesOrder);
         bv.setFormVariables(variables);
         bv.setOrgSidPath(busSalesOrder.getOrgSidPath());
+        //流程定义id
+        bv.setModelId(busSalesOrder.getProcDefId());
         if (bv.getTaskId().equals(busSalesOrder.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -4409,7 +4413,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
         Map<String, Object> variables = getOrderMap(busSalesOrder);
         bv.setFormVariables(variables);
-        bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
+//        bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
+        bv.setModelId(busSalesOrder.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<BusSaleOrderNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BusSaleOrderNodeVo.class)).collect(Collectors.toList());
@@ -4431,7 +4436,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
         Map<String, Object> variables = getOrderMap(busSalesOrder);
         bv.setFormVariables(variables);
-        bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
+//        bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
+        bv.setModelId(busSalesOrder.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<BusSaleOrderNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BusSaleOrderNodeVo.class)).collect(Collectors.toList());
@@ -4906,7 +4912,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         BusSalesOrder busSalesOrder = fetchBySid(orderFlowableQuery.getBusinessSid());
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(orderFlowableQuery, bv);
-        bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
+//        bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
+        bv.setModelId(busSalesOrder.getProcDefId());
         ResultBean resultBean = complete(bv);
         if (resultBean.getSuccess()) {
             if (BusSalesOrderConstantUtils.TypeEnum.PRODUCTION_SCHEDULING.getCode().equals(busSalesOrder.getType())) {

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -23,7 +23,7 @@ public enum ProcDefEnum {
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),
-    SALESORDER("销售订单审批流程", "process_p5ils2rn:8:1070004"),
+    SALESORDER("销售订单审批流程", "process_p5ils2rn:9:1167504"),
     BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:722504"),
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),

anrui-riskcenter/anrui-riskcenter-biz/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
+   <parent>
         <groupId>com.yxt</groupId>
         <artifactId>yxt-parent</artifactId>
         <version>0.0.1</version>
@@ -79,6 +79,12 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.yxt.anrui</groupId>
+            <artifactId>anrui-flowable-api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
 
     </dependencies>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/RiskCenterApplication.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.riskcenter"
 })
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal","com.yxt.anrui.buscenter","com.yxt.anrui.crm","com.yxt.anrui.base"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal","com.yxt.anrui.buscenter","com.yxt.anrui.crm","com.yxt.anrui.base","com.yxt.anrui.flowable"})
 public class RiskCenterApplication {
 
     public static void main(String[] args) {