diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java index d40b612685..a220adc3e4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java @@ -83,6 +83,8 @@ public class FinBillApplicationDto implements Dto { private String procDefId; @ApiModelProperty("环节定义的sid") private String nodeSid; + @ApiModelProperty("流程状态") + private String nodeState; @ApiModelProperty("流程实例的sid") private String procInstSid; @ApiModelProperty(value = "是否延迟开票") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 058087b88e..fa19d2b0aa 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -364,14 +364,6 @@ public class FinBillApplicationService extends MybatisBaseService commonContractVoResultBean = commonContractFeign.fetchBySid(sid1); - CommonContractVo data = commonContractVoResultBean.getData(); - String orderSid = data.getBusSid(); - if (StringUtils.isNotBlank(oneBillMoney)){ - busSalesOrderFeign.updateOneBillMoneyByOrderSid(orderSid,oneBillMoney); - } updateBySid(dto, dtoSid); BeanUtil.copyProperties(finBillApplicationPublic, finBillApplicationPublicDto); finBillApplicationPublicService.updateBySid(finBillApplicationPublicDto, billAppPublicSid); @@ -559,6 +551,13 @@ public class FinBillApplicationService extends MybatisBaseService commonContractVoResultBean = commonContractFeign.fetchBySid(sid1); + CommonContractVo data = commonContractVoResultBean.getData(); + String orderSid = data.getBusSid(); + busSalesOrderFeign.updateOneBillMoneyByOrderSid(orderSid,oneBillMoney); } } paramMap.put("nodeState", nodeState); diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 797e9c47e1..efa2f7bfa3 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -10,7 +10,7 @@ public enum ProcDefEnum { ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"), SALESPOLICY("销售政策审批流程", "sales_policy_oxeeyzhr:1:247508"), - FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:242768"), + FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"), ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), ARREARSCARRYVEHICLE("欠款提车审批流程", "arrears_carryvehicle:1:232589"), VEHICLEAPPLY("排产申请流程", "process_9egcg169:1:242660"),