From 515d9aa191f33e7f755a2e825d6e7605ca7f05ca Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 28 Mar 2025 17:28:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentrecordFeign.java | 18 ++--- .../FinPaymentrecordRest.java | 22 ++---- .../FinPaymentrecordService.java | 74 +++++++++++++++---- 3 files changed, 74 insertions(+), 40 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java index 19071ecf55..0943aba447 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java @@ -33,19 +33,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -/** - * Project: anrui-fin(财务)
- * File: FinPaymentrecordFeign.java
- * Class: com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign
- * Description: fin_paymentrecord.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-23 13:45:10
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "fin_paymentrecord") @FeignClient( contextId = "anrui-fin-FinPaymentrecord", @@ -104,4 +91,9 @@ public interface FinPaymentrecordFeign { @GetMapping("/fetchBySid") @ResponseBody ResultBean fetchBySid(@RequestParam("sid") String sid); + + @ApiOperation("出纳付款列表推送财务凭证") + @PostMapping("/pushVoucher") + @ResponseBody + public ResultBean pushVoucher(@RequestParam("sid") String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java index ec8e397193..2d0e6c6421 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java @@ -34,21 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * Project: anrui-fin(财务)
- * File: FinPaymentrecordFeignFallback.java
- * Class: com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordRest
- * Description: fin_paymentrecord.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-23 13:45:10
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "出纳付款列表") -@RestController("com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordRest") +@RestController @RequestMapping("v1/finpaymentrecord") public class FinPaymentrecordRest implements FinPaymentrecordFeign { @@ -110,4 +97,11 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign { FinPaymentrecord finPaymentrecord = finPaymentrecordService.fetchBySid(sid); return rb.success().setData(finPaymentrecord); } + + @Override + public ResultBean pushVoucher(String sid) { + ResultBean rb = ResultBean.fireFail(); + finPaymentrecordService.pushVoucher(sid); + return rb.success(); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index e21aba2e3e..dc2e8ba24a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -55,6 +55,7 @@ import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo; import com.yxt.anrui.fin.api.finpaymentrecord.*; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; +import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill; import com.yxt.anrui.fin.api.kingdee.voucher.Voucher; import com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankService; @@ -64,6 +65,7 @@ import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleServic import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService; import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService; import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService; +import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.flow.FlowableFeign; import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; @@ -105,6 +107,7 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; @@ -117,19 +120,6 @@ import java.util.stream.Collectors; import static java.util.Comparator.comparing; -/** - * Project: anrui-fin(财务)
- * File: FinPaymentrecordService.java
- * Class: com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService
- * Description: fin_paymentrecord 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-23 13:45:10
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Slf4j @Service public class FinPaymentrecordService extends MybatisBaseService { @@ -192,6 +182,10 @@ public class FinPaymentrecordService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentrecordQuery query = pq.getParams(); @@ -1627,4 +1621,58 @@ public class FinPaymentrecordService extends MybatisBaseService voucherResultDetailDtos = new ArrayList<>(); + Voucher.VoucherResultDetailDto voucherResultDetailDto = new Voucher.VoucherResultDetailDto(); + if ("015".equals(finPaymentrecord.getCostTitleKey())) {//银行保证金 + //借方 + voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); + voucherResultDetailDto.setSubjectNo("1009.03"); + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData(); + voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode()); + String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData(); + voucherResultDetailDto.setBank(key); + voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString()); + voucherResultDetailDtos.add(voucherResultDetailDto); + //贷方 + voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); + voucherResultDetailDto.setSubjectNo("1002.01.00"); + voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount()); + voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString()); + voucherResultDetailDtos.add(voucherResultDetailDto); + } else if ("016".equals(finPaymentrecord.getCostTitleKey())) {//银行手续费 + //借方 + voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); + voucherResultDetailDto.setSubjectNo("6603.03.00"); + voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString()); + voucherResultDetailDtos.add(voucherResultDetailDto); + //贷方 + voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); + voucherResultDetailDto.setSubjectNo("1002.01.00"); + voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount()); + voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString()); + voucherResultDetailDtos.add(voucherResultDetailDto); + } else if ("017".equals(finPaymentrecord.getCostTitleKey())) {//金融服务费 + //借方 + voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); + voucherResultDetailDto.setSubjectNo("6603.03.00"); + voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString()); + voucherResultDetailDtos.add(voucherResultDetailDto); + //贷方 + voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); + voucherResultDetailDto.setSubjectNo("1002.01.00"); + voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount()); + voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString()); + voucherResultDetailDtos.add(voucherResultDetailDto); + } + voucher.setResultDetails(voucherResultDetailDtos); + finKingDeeFeign.saveVoucher(voucher); + } }