开票申请、欠款开票、欠款领票流程图调整。

开票申请代码调整。

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -585,8 +585,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
-        //判断是否是高低开，若是，则isTrue网关参数为true=============添加
         String contractNo = finBillApplication.getContractNo();
+        //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
+        variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
+        //判断是否是高低开，若是，则isAdj网关参数为true=============添加
         BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
         if (data != null) {
             variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
@@ -701,7 +704,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         }
                     }
                 }
-                BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
                 BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
                 if (oneBillMoney == null) {
                     busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
@@ -742,8 +744,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         } else {
             bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
         }
-        //判断是否是高低开，若是，则isTrue网关参数为true=============添加
         String contractNo = finBillApplication.getContractNo();
+        //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
+        variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
+        //判断是否是高低开，若是，则isAdj网关参数为true=============添加
         BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
         if (data != null) {
             variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
@@ -776,8 +781,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         } else {
             bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
         }
-        //判断是否是高低开，若是，则isTrue网关参数为true=============添加
         String contractNo = finBillApplication.getContractNo();
+        //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
+        variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
+        //判断是否是高低开，若是，则isAdj网关参数为true=============添加
         BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
         if (data != null) {
             variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
@@ -819,8 +827,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 Map<String, Object> appMap = new HashMap<>();
                 appMap.put("sid", businessSid);
                 variables.put("app", appMap);
-                //判断是否是高低开，若是，则isTrue网关参数为true=============添加
                 String contractNo = finBillApplication.getContractNo();
+                //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
+                BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
+                variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
+                //判断是否是高低开，若是，则isAdj网关参数为true=============添加
                 BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
                 if (data != null) {
                     variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
@@ -3065,8 +3076,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
-        //判断是否是高低开，若是，则isTrue网关参数为true=============添加
         String contractNo = finBillApplication.getContractNo();
+        //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
+        variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
+        //判断是否是高低开，若是，则isAdj网关参数为true=============添加
         BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
         if (data != null) {
             variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
@@ -3232,7 +3246,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         }
                     }
                 }
-                BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
                 BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
                 if (oneBillMoney == null) {
                     busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());

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

@@ -12,9 +12,12 @@ public enum ProcDefEnum {
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
-    FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
+    //FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
-    QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
+    FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:2:1592504"),
-    QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:2:1365004"),
+    //QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
+    QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:3:1592508"),
+    //QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:2:1365004"),
+    QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:4:1592512"),
     BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
     //    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
     ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:2:1347504"),