From 2eda2726bb1fdaa3820fdf91633b6079cbcda9bd Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 17 Jul 2023 16:42:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E5=BA=94=E6=94=B6=E6=9C=AA=E6=94=B6=E5=88=86=E9=A1=B5=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusArrearsCarryVehicleApplyService.java | 54 ++++++++++--------- ...ppFinUncollectedReceivablesDetailedVo.java | 2 + .../FinCollectionConfirmationService.java | 33 ++++++++++-- .../FinFundsCarriedForwardVehMapper.java | 2 + .../FinFundsCarriedForwardVehMapper.xml | 7 +++ .../FinFundsCarriedForwardVehService.java | 4 ++ .../FinSelectedReceivablesDetailedMapper.java | 2 + .../FinSelectedReceivablesDetailedMapper.xml | 42 ++++++++++----- ...FinSelectedReceivablesDetailedService.java | 4 ++ 9 files changed, 110 insertions(+), 40 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 5abbadc99c..c452e71388 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -33,6 +33,7 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarry import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum; +import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*; @@ -1929,31 +1930,36 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); if (vehicleDetailsVos.size() > 0) { for (BusArrearsCarryVehicleDetailsVo vehicleDetailsVo : vehicleDetailsVos) { - BusDeliveredDto busDeliveredDto = new BusDeliveredDto(); - busDeliveredDto.setCreateBySid(busArrearsCarryVehicleApply.getCreateBySid()); - busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); - busDeliveredDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks()); - busDeliveredDto.setPaymentMethodKey(busArrearsCarryVehicleApply.getPaymentMethodKey()); - busDeliveredDto.setPaymentMethod(busArrearsCarryVehicleApply.getPaymentMethod()); - busDeliveredDto.setContractNo(busArrearsCarryVehicleApply.getContractNo()); - busDeliveredDto.setName(busArrearsCarryVehicleApply.getCustomerName()); - AppOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderService.getSaleOrderDetailsByContractNo(busArrearsCarryVehicleApply.getContractNo()).getData(); - if (busSalesOrderDetailsVo != null) { - AppOrderPriceInfoVo priceInfoVo = busSalesOrderDetailsVo.getPriceInfo(); - busDeliveredDto.setPrice(priceInfoVo.getSingleFinalPrice()); - AppOrderModelInfoVo appOrderModelInfoVo = busSalesOrderDetailsVo.getModelInfo(); - busDeliveredDto.setModelName(appOrderModelInfoVo.getModelName()); - busDeliveredDto.setMobile(busSalesOrderDetailsVo.getPhone()); - } - busDeliveredDto.setUseOrgSid(busArrearsCarryVehicleApply.getUseOrgSid()); - ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(busArrearsCarryVehicleApply.getUseOrgSid()); - if (sysOrganizationVoResultBean.getData() != null) { - busDeliveredDto.setUseOrgName(sysOrganizationVoResultBean.getData().getName()); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busArrearsCarryVehicleApply.getContractNo(),vehicleDetailsVo.getVinSid()); + //根据busVinSid查询待出库中是否存在该数据 + ResultBean busDeliveredResultBean = busDeliveredService.selectByBusVinSid(busSalesOrderVehicle.getSid()); + if (busDeliveredResultBean.getData() == null) { + BusDeliveredDto busDeliveredDto = new BusDeliveredDto(); + busDeliveredDto.setCreateBySid(busArrearsCarryVehicleApply.getCreateBySid()); + busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); + busDeliveredDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks()); + busDeliveredDto.setPaymentMethodKey(busArrearsCarryVehicleApply.getPaymentMethodKey()); + busDeliveredDto.setPaymentMethod(busArrearsCarryVehicleApply.getPaymentMethod()); + busDeliveredDto.setContractNo(busArrearsCarryVehicleApply.getContractNo()); + busDeliveredDto.setName(busArrearsCarryVehicleApply.getCustomerName()); + AppOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderService.getSaleOrderDetailsByContractNo(busArrearsCarryVehicleApply.getContractNo()).getData(); + if (busSalesOrderDetailsVo != null) { + AppOrderPriceInfoVo priceInfoVo = busSalesOrderDetailsVo.getPriceInfo(); + busDeliveredDto.setPrice(priceInfoVo.getSingleFinalPrice()); + AppOrderModelInfoVo appOrderModelInfoVo = busSalesOrderDetailsVo.getModelInfo(); + busDeliveredDto.setModelName(appOrderModelInfoVo.getModelName()); + busDeliveredDto.setMobile(busSalesOrderDetailsVo.getPhone()); + } + busDeliveredDto.setUseOrgSid(busArrearsCarryVehicleApply.getUseOrgSid()); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(busArrearsCarryVehicleApply.getUseOrgSid()); + if (sysOrganizationVoResultBean.getData() != null) { + busDeliveredDto.setUseOrgName(sysOrganizationVoResultBean.getData().getName()); + } + //根据合同和车辆sid查询销售订单车辆sid + BusSalesOrderVehicle busSaleOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busArrearsCarryVehicleApply.getContractNo(), vehicleDetailsVo.getVinSid()); + busDeliveredDto.setBusVinSid(busSaleOrderVehicle.getSid()); + busDeliveredService.saveOrUpdateDto(busDeliveredDto); } - //根据合同和车辆sid查询销售订单车辆sid - BusSalesOrderVehicle busSaleOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busArrearsCarryVehicleApply.getContractNo(), vehicleDetailsVo.getVinSid()); - busDeliveredDto.setBusVinSid(busSaleOrderVehicle.getSid()); - busDeliveredService.saveOrUpdateDto(busDeliveredDto); } } } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java index bf23b24c15..60ee0ee2d7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/AppFinUncollectedReceivablesDetailedVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -59,5 +60,6 @@ public class AppFinUncollectedReceivablesDetailedVo implements Vo { @ApiModelProperty("采购系统sid") private String purchaseSystemSid; @ApiModelProperty("应收金额：不变") + @JsonIgnore private String reveivableMoney; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 41b6f0f323..672d71d4ec 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -66,6 +66,7 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollected import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; import com.yxt.anrui.fin.api.kingdee.arreceivebill.ARReceivebill; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; +import com.yxt.anrui.fin.biz.finfundscarriedforwardveh.FinFundsCarriedForwardVehService; import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; @@ -157,6 +158,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -1013,7 +1016,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService getPaymentDetailsList(PagerQuery pagerQuery) { + public IPage getPaymentDetailsList111(PagerQuery pagerQuery) { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); AppFinSelectedReceivablesPaymentDetailsQuery params = pagerQuery.getParams(); String orgPath = pagerQuery.getParams().getOrgPath(); @@ -1135,7 +1138,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService getPaymentDetailsList111(PagerQuery pagerQuery) { + public IPage getPaymentDetailsList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); AppFinSelectedReceivablesPaymentDetailsQuery params = pagerQuery.getParams(); String orgPath = params.getOrgPath(); @@ -1157,14 +1160,36 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { qw.notIn("furd.sid", params.getSidList()); } - qw.gt("furd.currentReceivableMoney", 0);//应收金额 + /* qw.gt("furd.currentReceivableMoney", 0);//应收金额*/ if (StringUtils.isNotBlank(pagerQuery.getParams().getPurchaseSystemSid())) { qw.eq("furd.purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid()); } else { qw.eq("furd.purchaseSystemSid", "0"); } } - IPage pagging = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw,params.getName()); + IPage pagging = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName()); + /* List records = pagging.getRecords(); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) { + for (int i = 0; i < records.size(); i++) { + AppFinUncollectedReceivablesDetailedVo vo = records.get(i); + //查询当前应收:应收金额-所有认款的余额=剩余应收金额 (所有认款的余额 = 认款金额-结转之和) + String receivablesSid = vo.getReceivablesSid(); + //查询所有的该应收未收的已提交和已审核的认款 + List stringList = finSelectedReceivablesDetailedService.selectListByReceivableSid(receivablesSid); + stringList.removeAll(Collections.singleton(null)); + if (!stringList.isEmpty()) { + //所有已提交和已审核的认款 + BigDecimal bigDecimalVinAll = stringList.stream().map(FinSelectedReceivablesDetailed::getSubscriptionMoney).reduce(BigDecimal.ZERO, BigDecimal::add); + List sidsList = stringList.stream().map(v -> v.getSid()).collect(Collectors.toList()); + //查询所有已提交和已审核的认款是否包含结转的 + String forwardMoneyAll = finFundsCarriedForwardVehService.selectByBusSid(sidsList); + BigDecimal reveivableMoney = bigDecimalVinAll.subtract(new BigDecimal(forwardMoneyAll)); + BigDecimal receivable = new BigDecimal(vo.getReceivable()).subtract(reveivableMoney); + vo.setReceivable(receivable.toString()); + } + } + }*/ return pagging; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java index 658bbf2ae1..b4d160c8e0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java @@ -74,4 +74,6 @@ public interface FinFundsCarriedForwardVehMapper extends BaseMapper sidsList); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml index c938fd4032..c82952c058 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml @@ -37,4 +37,11 @@ ON fv.`busSid` = fd.`sid` WHERE fa.`nodeState` != "待提交" AND fa.`nodeState` != "终止" AND fa.`nodeState` != "发起申请" AND fv.busSid = #{busSid} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java index c7a8b1d325..960d112bba 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java @@ -157,4 +157,8 @@ public class FinFundsCarriedForwardVehService extends MybatisBaseService sidsList) { + return baseMapper.selectByBusSid(sidsList); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index 97bd1663af..20e9bb4ec1 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -157,4 +157,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper selectListByReceivableSid(String receivablesSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index 72849facc2..ad3af61eab 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -25,29 +25,38 @@ @@ -373,4 +383,12 @@ where receivablesSid = #{receivablesSid} and (auditState = 1 or auditState = 3) + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index fbd13e495c..4de1739d36 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -575,4 +575,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService selectListByReceivableSid(String receivablesSid) { + return baseMapper.selectListByReceivableSid(receivablesSid); + } } \ No newline at end of file