优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApply.java

@@ -76,6 +76,10 @@ public class BaseTrailerOutApply extends BaseEntity {
     private String gcVinNo; // 挂车车架号
 	@ApiModelProperty("业务状态 001正常开票 002包牌开票 003欠款开票")
     private String businessState; // 业务状态 001正常开票 002包牌开票 003欠款开票
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
+    @ApiModelProperty(value = "开票名称")
+    private String openTickName;
 	@ApiModelProperty("开票单位")
     private String invoiceTitle; // 开票单位
 	@ApiModelProperty("开票类型key")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyDetailsVo.java

@@ -83,6 +83,10 @@ public class BaseTrailerOutApplyDetailsVo implements Vo {
     private String gcVinNo; // 挂车车架号
 	@ApiModelProperty("业务状态 001正常开票 002包牌开票 003欠款开票")
     private String businessState; // 业务状态 001正常开票 002包牌开票 003欠款开票
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
+    @ApiModelProperty(value = "开票名称")
+    private String openTickName;
 	@ApiModelProperty("开票单位")
     private String invoiceTitle; // 开票单位
 	@ApiModelProperty("开票类型key")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyDto.java

@@ -81,6 +81,10 @@ public class BaseTrailerOutApplyDto implements Dto {
     private String gcVinNo; // 挂车车架号
 	@ApiModelProperty("业务状态 001正常开票 002包牌开票 003欠款开票")
     private String businessState; // 业务状态 001正常开票 002包牌开票 003欠款开票
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
+    @ApiModelProperty(value = "开票名称")
+    private String openTickName;
 	@ApiModelProperty("开票单位")
     private String invoiceTitle; // 开票单位
 	@ApiModelProperty("开票类型key")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java

@@ -311,11 +311,14 @@ public class BaseTrailerOutApplyService extends MybatisBaseService<BaseTrailerOu
         baseTrailerOutApplyDetailsVo.setGcVinNo(baseTrailer.getVinNo());
         //业务状态
         baseTrailerOutApplyDetailsVo.setBusinessState(finBillApplicationDetailsVo.getBillStateValue());
+        //开票名称
+        baseTrailerOutApplyDetailsVo.setOpenTickSid(finBillVehicleDetailsVo.getOpenTickSid());
+        baseTrailerOutApplyDetailsVo.setOpenTickName(finBillVehicleDetailsVo.getOpenTickName());
         //开票单位
         baseTrailerOutApplyDetailsVo.setInvoiceTitle(finBillApplicationDetailsVo.getOpenTickUnitName());
         //开票类型
-        baseTrailerOutApplyDetailsVo.setBillTypeKey(finBillApplicationDetailsVo.getOpenTickTypeKey());
-        baseTrailerOutApplyDetailsVo.setBillTypeValue(finBillApplicationDetailsVo.getOpenTickTypeValue());
+        baseTrailerOutApplyDetailsVo.setBillTypeKey(finBillVehicleDetailsVo.getBillTypeKey());
+        baseTrailerOutApplyDetailsVo.setBillTypeValue(finBillVehicleDetailsVo.getBillTypeValue());
         //销售合同价
         baseTrailerOutApplyDetailsVo.setOneBillMoney(baseTrailer.getDealPrice().toString());
         //开票信息

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java

@@ -79,14 +79,14 @@ public class FinBillApplicationDto implements Dto {
     private String totalBillMoney;
     @ApiModelProperty("申请日期")
     private String applyDate;
-    @ApiModelProperty("流程定义的id")
+/*    @ApiModelProperty("流程定义的id")
     private String procDefId;
     @ApiModelProperty("环节定义的sid")
     private String nodeSid;
     @ApiModelProperty("流程状态")
     private String nodeState;
     @ApiModelProperty("流程实例的sid")
-    private String procInstSid;
+    private String procInstSid;*/
     @ApiModelProperty(value = "是否延迟开票")
     private String isDelayBill;
     @ApiModelProperty(value = "是否高低开")

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

@@ -685,7 +685,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //========================================
         finBillApplication = fetchBySid(businessSid);
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
-        flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId());
+        if (StringUtils.isBlank(finBillApplication.getProcDefId())){
+            flowProcessMapQuery.setProDefKey(bv.getModelId());
+        }else {
+            flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId());
+        }
         flowProcessMapQuery.setVariables(variables);
         flowProcessMapQuery.setContractNo(finBillApplication.getContractNo());
         variables = flowableFeign.getMap(flowProcessMapQuery).getData();
@@ -2016,7 +2020,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             bv.setTaskDefKey(finBillApplication.getNodeSid());
             bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
-            return complete(bv);
+            return completeQK(bv);
         }
         return null;
     }
@@ -2035,7 +2039,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //========================================
         finBillApplication = fetchBySid(businessSid);
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
-        flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId());
+        if (StringUtils.isBlank(finBillApplication.getProcDefId())){
+            flowProcessMapQuery.setProDefKey(bv.getModelId());
+        }else {
+            flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId());
+        }
         flowProcessMapQuery.setVariables(variables);
         flowProcessMapQuery.setContractNo(finBillApplication.getContractNo());
         variables = flowableFeign.getMap(flowProcessMapQuery).getData();