diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 78d09bc8e1..9f9054ad03 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -637,12 +637,6 @@ public class BaseAccadjApplyService extends MybatisBaseService collectionDetailDtoListOne = new ArrayList<>(); + OtherReceivable.CollectionDetailDto collectionDetailDtoOne = new OtherReceivable.CollectionDetailDto(); + SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getOrgSid()).getData(); + collectionDetailDtoOne.setDearDept(sysOrganizationVo2.getOrgCode()); + BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData(); + if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) { + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), zcDto.getVinSid()).getData(); + String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData(); + if (StringUtils.isNotBlank(otherReceivableMoney)) { + collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney); + }else { + return null; + } + } + collectionDetailDtoListOne.add(collectionDetailDtoOne); + otherReceivableOne.setCollectionDetails(collectionDetailDtoListOne); + return otherReceivableOne; + } + private SalOutStock createZSGCOrSZOutStock(List gcOrSzDtos, BaseVehicleOutApply baseVehicleOutApply, String temporaryNumGcOrSz) { SalOutStock salOutStock = new SalOutStock(); //单据编号 @@ -1858,7 +1892,7 @@ public class BaseVehicleOutService extends MybatisBaseService userInfo; + @ApiModelProperty("营运经历") + private List yYInfo; + @ApiModelProperty("运输信息") + private List transInfo; + @ApiModelProperty("资产情况") + private List zCInfo; }