diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/data_FEntity.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/data_FEntity.json
index 99a937a4b8..4611a2f0fa 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/data_FEntity.json
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkmisdelivery/data_FEntity.json
@@ -6,9 +6,9 @@
"FUnitID": {
"FNumber": "@KD_FUnitID"
},
- "FQty": {
- "FNumber": "@KD_FQty"
- },
+ "FQty": 1.0,
+ "FREALQTY": 1.0,
+ "FBASEQTY": 1.0,
"FSTOCKID": {
"FNumber": "@KD_FSTOCKID"
},
@@ -18,5 +18,7 @@
"FOWNERTYPEID": "BD_OwnerOrg",
"FOWNERID": {
"FNumber": "@KD_FOWNERID"
- }
+ },
+ "FKEEPERTYPEID": "BD_KeeperOrg",
+ "FKEEPERID": {"FNumber": "@KD_FKEEPERID"}
}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeignFallback.java
index 2f2d0b9698..bd8a45d407 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeignFallback.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeignFallback.java
@@ -33,19 +33,6 @@ import org.springframework.stereotype.Component;
import java.util.List;
-/**
- * Project: anrui-riskcenter(车辆交回事前报备申请)
- * File: LoanRestoreReportApplyFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyFeignFallback
- * Description: 车辆交回事前报备申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-01-08 11:43:57
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Component
public class LoanRestoreReportApplyFeignFallback implements LoanRestoreReportApplyFeign {
@@ -120,4 +107,9 @@ public class LoanRestoreReportApplyFeignFallback implements LoanRestoreReportApp
public ResultBean delegate(LoanRestoreReportDelegateQuery query) {
return null;
}
+
+ @Override
+ public ResultBean getAlrepaidAndArr2(String busVinSid) {
+ return null;
+ }
}
\ 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 a1b63affb4..ae00538561 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
@@ -7,11 +7,21 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVinStateSetQuery;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
+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.voucher.Voucher;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
@@ -36,8 +46,21 @@ 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.loanrestorereportapply.AlrepaidAndArrVo;
+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;
+import com.yxt.anrui.riskcenter.api.loansubletapply.flow.*;
+import com.yxt.anrui.riskcenter.api.loansubletveh.LoanSubletVeh;
+import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanoutboundveh.LoanOutboundVehService;
+import com.yxt.anrui.riskcenter.biz.loanredemptionapply.LoanRedemptionApplyService;
+import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
+import com.yxt.anrui.riskcenter.biz.loansubletveh.LoanSubletVehService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.ConstantUtils;
@@ -57,6 +80,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
@@ -100,6 +124,8 @@ public class LoanOutboundApplyService extends MybatisBaseService listPage(PagerQuery pq) {
IPage page = PagerUtil.queryToPage(pq);
@@ -642,6 +668,21 @@ public class LoanOutboundApplyService extends MybatisBaseService busVinSidList) {
+ Voucher voucher = new Voucher();
+ SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(loanOutboundApply.getUseOrgSid()).getData();
+ if (null != organizationVo) {
+ voucher.setAccountBook(organizationVo.getOrgCode());
+ voucher.setVoucherNo(organizationVo.getOrgCode());
+ }
+ SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(loanOutboundApply.getDeptSid()).getData();
+
+
+
+
}
public void pushStkOut(LoanOutboundApply loanOutboundApply,List busVinSidList) {
@@ -664,9 +705,9 @@ public class LoanOutboundApplyService extends MybatisBaseService