From 513f6eb15460ca0cd77261ca4a60343ac5682dc6 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 15 May 2025 09:05:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busvehicleapply/BusVehicleApplyFeign.java | 5 ++ .../BusVehicleApplyFeignFallback.java | 5 ++ .../busvehicleapply/BusVehicleApplyRest.java | 5 ++ .../BusVehicleApplyService.java | 76 ++++++++++++++++++- 4 files changed, 89 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java index ede8355576..5ccd8bd12c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java @@ -116,4 +116,9 @@ public interface BusVehicleApplyFeign { @PostMapping("/getBillNo") @ResponseBody ResultBean getBillNo(@RequestParam("pcApplicationCode") String pcApplicationCode); + + @ApiOperation("rePushFin") + @PostMapping("/排产已办结没有推送财务出纳") + @ResponseBody + ResultBean rePushFin(@RequestParam("sid")String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java index 027fdf356c..d1e077e50c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java @@ -126,4 +126,9 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign { public ResultBean getBillNo(String pcApplicationCode) { return null; } + + @Override + public ResultBean rePushFin(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java index 6ef95061e8..ed7e392c54 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java @@ -140,6 +140,11 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign { return rb.success().setData(busVehicleApply); } + @Override + public ResultBean rePushFin(String sid) { + return busVehicleApplyService.rePushFin(sid); + } + /* @Override public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) { return busVehicleApplyService.shareBusVehicleApply(shareQuery); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index ea7abc7162..20ab884783 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -661,7 +661,7 @@ public class BusVehicleApplyService extends MybatisBaseService vo = busVehicleApplyDetailService.fetchByApplySid(bv.getBusinessSid()); vo.removeAll(Collections.singleton(null)); @@ -721,7 +721,8 @@ public class BusVehicleApplyService extends MybatisBaseService vo = busVehicleApplyDetailService.fetchByApplySid(sid); + vo.removeAll(Collections.singleton(null)); + if (busVehicleApply.getCurrentAmount() > 0) { + //未打款、未认款的厂家认款记录 + baseManufactorSubscriptionDto.setState(0);//未认款 + baseManufactorSubscriptionDto.setPaymentState("0");//未打款 + } else { + //无需打款、未认款的厂家认款记录 + baseManufactorSubscriptionDto.setState(0);//未认款 + baseManufactorSubscriptionDto.setPaymentState("2");//无需打款 + } + baseManufactorSubscriptionDto.setCreateOrgSid(busVehicleApply.getCreateOrgSid()); + baseManufactorSubscriptionDto.setUseOrgSid(busVehicleApply.getCreateOrgSid()); + baseManufactorSubscriptionDto.setPaymentMoney(busVehicleApply.getCurrentAmount().toString());//打款金额 + baseManufactorSubscriptionDto.setProSchAppNo(busVehicleApply.getApplicationCode());//排产申请编号 + baseManufactorSubscriptionDto.setApplyType(busVehicleApply.getApplyType()); + baseManufactorSubscriptionDto.setApplyTypeKey(busVehicleApply.getApplyTypeKey()); + ResultBean r = baseManufactorSubscriptionService.saveDto(baseManufactorSubscriptionDto); + + //推送到财务出纳 + if (busVehicleApply.getCurrentAmount() > 0) { + FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto(); + finPaymentrecordDto.setPurchaseSystemSid(busVehicleApply.getOrgDeptSid()); + finPaymentrecordDto.setPurchaseSystemName(busVehicleApply.getOrgDeptName()); + finPaymentrecordDto.setApplySid(busVehicleApply.getSid()); + finPaymentrecordDto.setPayCompanySid(busVehicleApply.getCreateOrgSid()); + finPaymentrecordDto.setPayType(1); + finPaymentrecordDto.setCreateOrgSid(busVehicleApply.getCreateOrgSid()); + finPaymentrecordDto.setUseOrgSid(busVehicleApply.getCreateOrgSid()); + finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().toString()); + finPaymentrecordDto.setAccountsReceive(busVehicleApply.getCurrentAmount().toString()); + finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode()); + finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks()); + finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.DJ_TYPE.getCode()); + finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.DJ_TYPE.getRemarks()); + finPaymentrecordDto.setDictTypeCode("payCostType"); + finPaymentrecordDto.setDictKey("005"); + finPaymentrecordDto.setPayRemark(busVehicleApply.getPayRemarks()); + finPaymentrecordDto.setCreateBySid(busVehicleApply.getCreateBySid()); + finPaymentrecordDto.setRemarks("排产订金"); + //查询收款单位和收款账号 + List busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid()); + String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid(); + //根据车型sid查询账户名称和银行账号 + List busApplyVo = baseManufacturerBankService.selectByApplySid(modelSid); + busApplyVo.removeAll(Collections.singleton(null)); + if (!busApplyVo.isEmpty()) { + finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum()); + finPaymentrecordDto.setReceiveBank(busApplyVo.get(0).getBankName()); + finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName()); + } + BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(busVehicleApply.getSupplierSid()); + if (baseManufacturer != null) { + finPaymentrecordDto.setPayCode(baseManufacturer.getManufacturerCode()); + } + finPaymentrecordDto.setBusSid(r.getData()); + finPaymentrecordDto.setBusRemarks(busVehicleApply.getPayRemarks()); + finPaymentrecordFeign.save(finPaymentrecordDto); + } + } + /** * 获取上一环节 * @@ -1107,6 +1173,12 @@ public class BusVehicleApplyService extends MybatisBaseService