diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 6ef2dab8c2..eba19aef5d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -1044,9 +1044,15 @@ public class BusDeliveredApplyService extends MybatisBaseService { + pushInvoice(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData()); + }); + }*/ Future future1 = pool.submit(() -> { pushInvoice(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData()); }); + } //推送优惠包交接数据 Future future2 = pool.submit(() -> { @@ -1280,7 +1286,7 @@ public class BusDeliveredApplyService extends MybatisBaseService { - pushInvoice(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData()); + pushInvoice2(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData()); }); //推送优惠包交接数据 @@ -1620,6 +1626,66 @@ public class BusDeliveredApplyService extends MybatisBaseService detailsList, + AppOrderDetailsVo appOrderDetailsVo, + SysUserVo sysUserVo) { + log.info("推送开票申请数据开始啦~~~~~~~~~~~~~~~~~~~~~~~~=============================="); + //推送开票申请======= + FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); + finBillApplicationDto.setUseOrgSid(busDeliveredApply.getUseOrgSid()); + finBillApplicationDto.setCreateBySid(busDeliveredApply.getApplySid()); + finBillApplicationDto.setCreateByName(busDeliveredApply.getApplyName()); + finBillApplicationDto.setContractNo(busDeliveredApply.getContractNo()); + if (appOrderDetailsVo != null) { + finBillApplicationDto.setCustomerSid(appOrderDetailsVo.getCustomerSid()); + //开票单位 + if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + finBillApplicationDto.setOpenTickUnitName(invoicingDetailsVoResultBean.getData().getName()); + } + } + } + finBillApplicationDto.setCustomerName(busDeliveredApply.getName()); + finBillApplicationDto.setDeptSid(busDeliveredApply.getApplyDeptSid()); + finBillApplicationDto.setDeptName(busDeliveredApply.getApplyDept()); + finBillApplicationDto.setModelName(busDeliveredApply.getModelName()); + finBillApplicationDto.setModelSid(busDeliveredApply.getModelSid()); + if (sysUserVo != null) { + finBillApplicationDto.setStaffSid(sysUserVo.getStaffSid()); + } + finBillApplicationDto.setStaffName(busDeliveredApply.getStaffName()); + finBillApplicationDto.setSaleDeptSid(busDeliveredApply.getStaffDeptSid()); + finBillApplicationDto.setSaleDeptName(busDeliveredApply.getStaffDeptName()); + finBillApplicationDto.setSaleTypeKey(busDeliveredApply.getPaymentMethodKey()); + finBillApplicationDto.setSaleTypeValue(busDeliveredApply.getPaymentMethod()); + finBillApplicationDto.setBillStateKey("001"); + finBillApplicationDto.setBillStateValue("正常开票"); + List finBillVehicles = new ArrayList<>(); + for (int i = 0; i < detailsList.size(); i++) { + FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto(); + BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i); + finBillVehicleDto.setVinNo(busDeliveredApplyDetails.getVinNo()); + finBillVehicleDto.setVehSid(busDeliveredApplyDetails.getVinSid()); + //合格证状态 + BaseVehicleCertificateVo baseVehicleCertificate = baseVehicleCertificateFeign.selStateByVehicleSid(busDeliveredApplyDetails.getVinSid()).getData(); + if (baseVehicleCertificate != null) { + finBillVehicleDto.setCertificateStateKey(baseVehicleCertificate.getCertificateState()); + finBillVehicleDto.setCertificateStateValue(baseVehicleCertificate.getCertificateStateValue()); + } + finBillVehicles.add(finBillVehicleDto); + } + finBillApplicationDto.setFinBillVehicles(finBillVehicles); + finBillApplicationDto.setArrearsMoney("0"); + finBillApplicationDto.setOpenTickTypeKey("02"); + finBillApplicationDto.setOpenTickTypeValue("增值税专用发票"); + finBillApplicationDto.setApplyDate(DateUtil.today()); + finBillApplicationDto.setOrgSidPath(busDeliveredApply.getOrgSidPath()); + ResultBean finBillResult = finBillApplicationFeign.save(finBillApplicationDto); + //====================推送开票结束 + } + /** * 出库办理后待准备 * 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 3fe24a17b7..bc86fa5a5b 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 @@ -2362,6 +2362,7 @@ public class FinBillApplicationService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断是否为销售专员发起 + variables.put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName())); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); //业务sid @@ -2378,7 +2381,6 @@ public class FinBillApplicationService extends MybatisBaseService orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/")); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); + String nextNodeUserSids_ = sysOrganization.getManagerSid(); + bv.setNextNodeUserSids(nextNodeUserSids_); + } + //======================================= if (r == 1) { ResultBean voResultBean = flowFeign.startProcess(bv); if (!voResultBean.getSuccess()) { @@ -2454,6 +2463,8 @@ public class FinBillApplicationService extends MybatisBaseService orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/")); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); + String nextNodeUserSids_ = sysOrganization.getManagerSid(); + bv.setNextNodeUserSids(nextNodeUserSids_); + } + //======================================= if (bv.getTaskId().equals(finBillApplication.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -2796,6 +2814,8 @@ public class FinBillApplicationService extends MybatisBaseService variables = bv.getFormVariables(); finBillApplication = fetchBySid(bv.getBusinessSid()); @@ -3326,6 +3352,8 @@ public class FinBillApplicationService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断是否为销售专员发起 + variables.put("isZy", finBillApplication1.getCreateByName().equals(finBillApplication1.getStaffName())); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); //业务sid @@ -3335,7 +3363,6 @@ public class FinBillApplicationService extends MybatisBaseService orgPathList = Arrays.asList(finBillApplication1.getOrgSidPath().split("/")); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); + String nextNodeUserSids_ = sysOrganization.getManagerSid(); + bv.setNextNodeUserSids(nextNodeUserSids_); + } + //======================================= if (r == 1) { ResultBean voResultBean = flowFeign.startProcess(bv); if (!voResultBean.getSuccess()) { @@ -3396,6 +3430,8 @@ public class FinBillApplicationService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断是否为销售专员发起 + variables.put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName())); //======================================== FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId()); @@ -3406,6 +3442,14 @@ public class FinBillApplicationService extends MybatisBaseService orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/")); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); + String nextNodeUserSids_ = sysOrganization.getManagerSid(); + bv.setNextNodeUserSids(nextNodeUserSids_); + } + //======================================= if (bv.getTaskId().equals(finBillApplication.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -3614,6 +3658,8 @@ public class FinBillApplicationService extends MybatisBaseService variables = new HashMap<>(); //查询业务信息 FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid()); + //判断是否为销售专员发起 + variables.put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName())); bv.setModelId(finBillApplication.getProcDefId()); //======================================== FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); @@ -3638,6 +3684,8 @@ public class FinBillApplicationService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断是否为销售专员发起 + variables.put("isZy", finBillApplication.getCreateByName().equals(finBillApplication.getStaffName())); //======================================== FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId()); 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 02cd351971..db1e95b61e 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 @@ -15,8 +15,8 @@ public enum ProcDefEnum { ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"), FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:5:5665004"), - QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:2:5100004"), - QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:5:4975008"), + QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:3:5682504"), + QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:6:5682508"), ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:5:4975004"), VEHICLEAPPLY("排产申请流程", "process_9egcg169:14:3120004"), SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:9:1865007"),