diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java index 7e12f39271..aad334bd01 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java @@ -24,6 +24,7 @@ import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.fin.api.kingdee.stkmiscellaneous.StkMiscellaneous; +import com.yxt.anrui.fin.api.kingdee.stkmisdelivery.StkMisDelivery; import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; import com.yxt.anrui.fin.api.kingdee.voucher.CollectionVoucher; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; @@ -371,4 +372,10 @@ public interface FinKingDeeFeign { @ResponseBody ResultBean draftStkMiscellaneous(@RequestBody @Valid StkMiscellaneous stkMiscellaneous); + @ApiOperation("其它出库单保存接口") + @PostMapping("/draftStkMisDelivery") + @ResponseBody + ResultBean draftStkMisDelivery(@RequestBody @Valid StkMisDelivery stkMisDelivery); + + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java index ce90810c5a..b225278e24 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java @@ -24,6 +24,7 @@ import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.fin.api.kingdee.stkmiscellaneous.StkMiscellaneous; +import com.yxt.anrui.fin.api.kingdee.stkmisdelivery.StkMisDelivery; import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; import com.yxt.anrui.fin.api.kingdee.voucher.CollectionVoucher; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; @@ -340,5 +341,10 @@ implements FinKingDeeFeign{ return null; } + @Override + public ResultBean draftStkMisDelivery(StkMisDelivery stkMisDelivery) { + return null; + } + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkmisdelivery/StkMisDelivery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkmisdelivery/StkMisDelivery.java index cd60461ac9..cb318909a8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkmisdelivery/StkMisDelivery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stkmisdelivery/StkMisDelivery.java @@ -32,7 +32,7 @@ public class StkMisDelivery { @Data - public class StkMisDeliveryEntry { + public static class StkMisDeliveryEntry { //物料编码 private String FMATERIALID; 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 2aa287b2e2..2d493c3265 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 @@ -75,6 +75,7 @@ import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CwSystemYT; import com.yxt.anrui.fin.api.kingdee.voucher.CollectionVoucher; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.fin.api.kingdee.voucher.SceneCodeEnum; +import com.yxt.anrui.fin.api.kingdee.voucher.Voucher; import com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService; import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService; @@ -87,6 +88,10 @@ import com.yxt.anrui.fin.biz.kingdee.capitalcreditresult.OtherReceivableBillCred import com.yxt.anrui.fin.fegin.as.asbusrepairbill.AsBusrepairBillFeign; import com.yxt.anrui.fin.fegin.as.asbusrepairbill.FinBusrepairBillVo; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; +import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; +import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign; +import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo; +import com.yxt.anrui.portal.api.sysmapping.SysMappingListInfoQuery; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; @@ -110,6 +115,8 @@ import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDe import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleFeign; +import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo; +import com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyFeign; import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyFeign; import com.yxt.anrui.riskcenter.api.loansettleapply.SettleFinVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; @@ -147,6 +154,7 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -219,6 +227,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -4364,6 +4378,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService collectionAfterVoucherDetails = new ArrayList<>(); + //---------------------------------------------------------- + //--------------------------推送赎回款 + Voucher voucher = new Voucher(); + if(organizationVo != null){ + voucher.setAccountBook(organizationVo.getOrgCode()); + voucher.setVoucherNo(organizationVo.getOrgCode()); + } + List voucherResultDetailDtos = new ArrayList<>(); + AtomicReference> resultRef = + new AtomicReference<>(voucherResultDetailDtos); + //=========================================== //查询该申请下的所有待审核的款项明细 BigDecimal subscriptionMoneyAll = new BigDecimal("0"); @@ -4633,6 +4658,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService getAll(FinCollectionConfirmation finalConfirmation, FinSelectedReceivablesDetailedVo v, String collectionDate) { + List list = new ArrayList<>(); + FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid()); + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finalConfirmation.getCreateDeptSid()).getData(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(finUncollectedReceivablesDetailed.getBusVinSid()).getData(); + String customerNumber = ""; + BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData(); + if (salesOrder != null && busSalesOrderVehicle != null) { + //判断财务系统是否有客户 + Boolean aBoolean = finKingDeeService.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData(); + String linkNo = ""; + BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData(); + if (!aBoolean) { + BdCustomer bdCustomer = new BdCustomer(); + bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); + bdCustomer.setFShortName(salesOrder.getContractNo()); + if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) { + BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData(); + bdCustomer.setTOrgIds(data.getOrgCode()); + } + bdCustomer.setTOrgIds(deptVo.getOrgCode()); + if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) { + String vinNo = busSalesOrderVehicle.getLinkNo(); + if (vinNo.length() > 8) { + linkNo = vinNo.substring(vinNo.length() - 8); + } else { + linkNo = busSalesOrderVehicle.getLinkNo(); + } + if (null != borrowerDetailsVo) { + bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo); + } + } else { + if (null != borrowerDetailsVo) { + bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo()); + } + } + ResultBean resultBean = finKingDeeFeignRest.draftBdCustomer(bdCustomer); + if (resultBean.getSuccess()) { + customerNumber = bdCustomer.getFNumber(); + } + } else { + customerNumber = busSalesOrderVehicle.getTemporaryNo(); + } + } + Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto(); + Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto(); + //贷方 + Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); + Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto(); + Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto(); + String payType = ""; + DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(finalConfirmation.getCollectionTypeKey(), "payVoucherType").getData(); + if (null != dictCommonVo) { + SysMappingListInfoQuery query = new SysMappingListInfoQuery(); + query.setDictSid(dictCommonVo.getSid()); + List data = sysMappingFeign.selectMappingListInfo(query).getData(); + if (!data.isEmpty()) { + SysMappingInfoVo sysMappingInfoVo = data.get(0); + payType = sysMappingInfoVo.getMap_itemKey(); + } + } + //--收款-赎回款(yyyy-MM-dd) + BigDecimal all = new BigDecimal(v.getSubscriptionMoney()); + if (all.compareTo(BigDecimal.ZERO) != 0) { + voucherResultDetailDtoJf.setSummary("收款-赎回款"+"（" + collectionDate + "）"); + voucherResultDetailDtoJf.setSubjectNo(payType); + voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum()); + voucherResultDetailDtoJf.setDebit(all.toString()); + list.add(voucherResultDetailDtoJf); + } + //-----出纳收款确认后-资金占用费 + AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyFeign.getAlrepaidAndArr2(finUncollectedReceivablesDetailed.getBusVinSid()).getData(); + BigDecimal zjzyfMoney = BigDecimal.ZERO; + String zjzyf = alrepaidAndArrVo.getWheFundOccMoney(); + zjzyfMoney = new BigDecimal(StringUtils.isBlank(zjzyf) ? "0" : zjzyf); + if (zjzyfMoney.compareTo(BigDecimal.ZERO) != 0) { + voucherResultDetailDtoDf.setSummary("收款-赎回款"); + voucherResultDetailDtoDf.setSubjectNo("1201.02.03"); + //核算部门 + voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoDf.setDimensionCustom(customerNumber); + voucherResultDetailDtoDf.setCredit(zjzyfMoney.toString()); + list.add(voucherResultDetailDtoDf); + voucherResultDetailDtoJf2.setSummary("资金占用费转收入"); + voucherResultDetailDtoJf2.setSubjectNo("2191.05.00"); + //核算部门 + voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoJf2.setDimensionCustom(customerNumber); + voucherResultDetailDtoJf2.setCredit(zjzyfMoney.toString()); + list.add(voucherResultDetailDtoJf2); + voucherResultDetailDtoDf3.setSummary("资金占用费转收入"); + voucherResultDetailDtoDf3.setSubjectNo("6002.01.17"); + //核算部门 + voucherResultDetailDtoDf3.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoDf3.setDimensionCustom(customerNumber); + voucherResultDetailDtoDf3.setCredit(zjzyfMoney.toString()); + list.add(voucherResultDetailDtoDf3); + } + BigDecimal allM = BigDecimal.ZERO; + allM = all.subtract(zjzyfMoney); + if(allM.compareTo(BigDecimal.ZERO)>0){ + voucherResultDetailDtoDf2.setSummary("收款-赎回款"); + voucherResultDetailDtoDf2.setSubjectNo("1201.03.01"); + //核算部门 + voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode()); + //核算客户 + voucherResultDetailDtoDf2.setDimensionCustom(customerNumber); + voucherResultDetailDtoDf2.setCredit(allM.toString()); + list.add(voucherResultDetailDtoDf2); + } + return list; + } + //名义价其他费用推财务 private CollectionVoucher.CollectionVoucherDetail getBalanceMoneyVoucher(FinSelectedReceivablesDetailedVo v, String collectionDate) { String planSid = ""; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index 21f83ae4e0..6615c06856 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -29,6 +29,7 @@ import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.fin.api.kingdee.stkmiscellaneous.StkMiscellaneous; +import com.yxt.anrui.fin.api.kingdee.stkmisdelivery.StkMisDelivery; import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect; import com.yxt.anrui.fin.api.kingdee.voucher.*; import com.yxt.anrui.fin.biz.kingdee.appayable.APPayableService; @@ -56,6 +57,7 @@ import com.yxt.anrui.fin.biz.kingdee.salesreturn.SalesReturnOrdersService; import com.yxt.anrui.fin.biz.kingdee.saloutstock.SalOutStockService; import com.yxt.anrui.fin.biz.kingdee.stkinstock.STKInStockService; import com.yxt.anrui.fin.biz.kingdee.stkmiscellaneous.StkMiscellaneousService; +import com.yxt.anrui.fin.biz.kingdee.stkmisdelivery.StkMisDeliveryService; import com.yxt.anrui.fin.biz.kingdee.stktransferdirect.StkTransferDirectService; import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; @@ -220,6 +222,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { @Autowired private StkMiscellaneousService stkMiscellaneousService; + @Autowired + private StkMisDeliveryService stkMisDeliveryService; @ApiOperation("入账暂存应付单的接口") @PostMapping("/draftEntryBill") @@ -2019,6 +2023,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { return stkMiscellaneousService.draftStkMiscellaneous(stkMiscellaneous); } + @Override + public ResultBean draftStkMisDelivery(StkMisDelivery stkMisDelivery) { + log.info("FinKingDeeFeignRest-draftStkMisDelivery:{}", JSONObject.toJSONString(stkMisDelivery)); + return stkMisDeliveryService.draftStkMisDelivery(stkMisDelivery); + } + @ApiOperation("暂存收款单的接口") @PostMapping("/draftArReceivebill") @ResponseBody diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/StkMisDeliveryService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/StkMisDeliveryService.java index 0e927572da..6bc4a30cac 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/StkMisDeliveryService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/StkMisDeliveryService.java @@ -38,6 +38,9 @@ public class StkMisDeliveryService extends FinKingDeeService { map_fEntityModel_.put("FDate", sdf.format(new Date())); } map_fEntityModel_.put("FBaseCurrId", "PRE001"); + map_fEntityModel_.put("FOwnerIdHead",stkMisDelivery.getFOwnerIdHead()); + map_fEntityModel_.put("FDEPTID",stkMisDelivery.getFDEPTID()); + map_fEntityModel_.put("FNOTE",stkMisDelivery.getFNOTE()); List stkMiscellaneousEntryList = stkMisDelivery.getStkMisDeliveryEntry() == null ? new ArrayList<>() : stkMisDelivery.getStkMisDeliveryEntry(); //准备 物料列表的数据 @@ -74,7 +77,7 @@ public class StkMisDeliveryService extends FinKingDeeService { m.put("FUnitID", c.getFUnitID()); m.put("FSTOCKID", c.getFSTOCKID()); m.put("FOWNERID", c.getFOWNERID()); - + m.put("FKEEPERID", c.getFOWNERID()); mapList.add(m); } return rb.success().setData(mapList); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeign.java index 0333f830a0..a07ef26483 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeign.java @@ -122,4 +122,9 @@ public interface LoanRestoreReportApplyFeign { @ApiOperation(value = "加签") @PostMapping(value = "/delegate") public ResultBean delegate(@RequestBody LoanRestoreReportDelegateQuery query); + + @ApiOperation(value = "查询车辆费用相关") + @GetMapping(value = "/getAlrepaidAndArr2") + public ResultBean getAlrepaidAndArr2(String busVinSid); + } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java index 91e299f5f5..f0cc272092 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java @@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loanoutboundapply; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -12,6 +13,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFe import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVinStateSetQuery; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; +import com.yxt.anrui.fin.api.kingdee.stkmiscellaneous.StkMiscellaneous; +import com.yxt.anrui.fin.api.kingdee.stkmisdelivery.StkMisDelivery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -35,6 +38,7 @@ import com.yxt.anrui.riskcenter.api.loanoutboundapply.app.AppOutboundDetailsVo; import com.yxt.anrui.riskcenter.api.loanoutboundapply.app.AppOutboundVinListVo; import com.yxt.anrui.riskcenter.api.loanoutboundapply.flow.*; import com.yxt.anrui.riskcenter.api.loanoutboundveh.LoanOutboundVeh; +import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply; import com.yxt.anrui.riskcenter.api.loansubletapply.*; import com.yxt.anrui.riskcenter.api.loansubletapply.app.AppSubletDetailsVo; import com.yxt.anrui.riskcenter.api.loansubletapply.app.AppSubletVinListVo; @@ -589,7 +593,7 @@ public class LoanOutboundApplyService extends MybatisBaseService busVinSidList = loanOutboundVehService.selectByMainSid(businessSid); - if(busVinSidList.isEmpty()){ + if(!busVinSidList.isEmpty()){ busVinStateSetQuery.setBusVinSidList(busVinSidList); if("客户赎回".equals(loanOutboundApply.getDisposal())){ busVinStateSetQuery.setState(2); @@ -603,6 +607,24 @@ public class LoanOutboundApplyService extends MybatisBaseService(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy()); + LoanOutboundApply finalLoanOutboundApply = loanOutboundApply; + Future future1 = pool.submit(() -> { + //推送其他出库单 + //TOdO: + pushStkOut(finalLoanOutboundApply,busVinSidList); + }); + } catch (Exception e) { + e.printStackTrace(); + } + + @@ -640,6 +662,32 @@ public class LoanOutboundApplyService extends MybatisBaseService busVinSidList) { + SysOrganizationVo sysOrg = sysOrganizationFeign.fetchBySid(loanOutboundApply.getUseOrgSid()).getData(); + StkMisDelivery stkMisDelivery = new StkMisDelivery(); + List stkMiscellaneousEntryList = new ArrayList<>(); + SysOrganizationVo sysOrgDept = sysOrganizationFeign.fetchBySid(loanOutboundApply.getDeptSid()).getData(); + stkMisDelivery.setFStockOrgId(sysOrg.getOrgCode()); + stkMisDelivery.setFDEPTID(sysOrgDept.getOrgCode()); + stkMisDelivery.setFNOTE(""); + stkMisDelivery.setFDate(DateUtil.today()); + stkMisDelivery.setFOwnerIdHead(sysOrg.getOrgCode()); + for (int i = 0; i < busVinSidList.size(); i++) { + StkMisDelivery.StkMisDeliveryEntry stkMisDeliveryEntry = new StkMisDelivery.StkMisDeliveryEntry(); + LoanOutboundVeh loanOutboundVeh = loanOutboundVehService.selectByMainSidAndBusVinSid(loanOutboundApply.getSid(),busVinSidList.get(i)); + stkMisDeliveryEntry.setFMATERIALID(loanOutboundVeh.getVinNo()); + stkMisDeliveryEntry.setFUnitID("liang"); + stkMisDeliveryEntry.setFSTOCKID("ARZSCK"); + stkMisDeliveryEntry.setFOWNERID(sysOrg.getOrgCode()); + stkMiscellaneousEntryList.add(stkMisDeliveryEntry); + stkMisDelivery.setStkMisDeliveryEntry(stkMiscellaneousEntryList); + } + + ResultBean resultBean = finKingDeeFeign.draftStkMisDelivery(stkMisDelivery); + + } + + /** * 撤回 * diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.java index 25972fe070..a9bc33813c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.java @@ -19,4 +19,6 @@ public interface LoanOutboundVehMapper extends BaseMapper { List selByMainSid(@Param("mainSid") String mainSid); List selectByMainSid(String businessSid); + + LoanOutboundVeh selectByMainSidAndBusVinSid(@Param("mainSid") String sid, @Param("busVinSid") String s); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.xml index ecc01cb232..a2ebfe7aef 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.xml @@ -18,4 +18,8 @@ from loan_out_bound_veh where mainSid = #{businessSid} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehService.java index 734a93bd1e..1d18439fd3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehService.java @@ -29,4 +29,8 @@ public class LoanOutboundVehService extends MybatisBaseService selectByMainSid(String businessSid) { return baseMapper.selectByMainSid(businessSid); } + + public LoanOutboundVeh selectByMainSidAndBusVinSid(String sid, String s) { + return baseMapper.selectByMainSidAndBusVinSid(sid,s); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java index ea93b402d6..8926d03153 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java @@ -66,6 +66,7 @@ public interface LoanRestoreReportApplyMapper extends BaseMapper + +