yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 years ago
parent
ee5278bf1a 995355130a
commit
1964c500e9
10 changed files with 93 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java
  2. 39
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  3. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java
  4. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java
  5. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java
  6. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateNewDetailsVo.java
  7. 12
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
  8. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceForm.java
  9. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateDetailsVo.java
  10. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

22
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java
View File

@ -275,13 +275,13 @@ public class BaseTrailerOutApplyService extends MybatisBaseService<BaseTrailerOu
return rb.setMsg("此主车车辆库存状态不是出库，请重新选择");
}
FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(vehSid).getData();
FinBillApplicationDetailsVo finBillApplicationDetailsVo = null;
FinBillApplication finBillApplication = null;
if (finBillVehicleDetailsVo == null) {
return rb.setMsg("关联的主车开票申请未审批通过，不可出库");
} else {
String billAppSid = finBillVehicleDetailsVo.getBillAppSid();
finBillApplicationDetailsVo = finBillApplicationFeign.fetchDetailsBySid(billAppSid).getData();
if (!finBillApplicationDetailsVo.getNodeState().equals("已办结")) {
finBillApplication = finBillApplicationFeign.fetchBySid(billAppSid).getData();
if (!finBillApplication.getNodeState().equals("已办结")) {
return rb.setMsg("关联的主车开票申请未审批通过，不可出库");
}
}
@ -301,13 +301,13 @@ public class BaseTrailerOutApplyService extends MybatisBaseService<BaseTrailerOu
//发起日期
baseTrailerOutApplyDetailsVo.setCreateTime(DateUtil.formatDate(new Date()));
//合同编号
baseTrailerOutApplyDetailsVo.setContractNo(finBillApplicationDetailsVo.getContractNo());
baseTrailerOutApplyDetailsVo.setContractNo(finBillApplication.getContractNo());
//客户信息
baseTrailerOutApplyDetailsVo.setCustomerSid(finBillApplicationDetailsVo.getCustomerSid());
baseTrailerOutApplyDetailsVo.setCustomerName(finBillApplicationDetailsVo.getCustomerName());
baseTrailerOutApplyDetailsVo.setCustomerSid(finBillApplication.getCustomerSid());
baseTrailerOutApplyDetailsVo.setCustomerName(finBillApplication.getCustomerName());
//销售类型
baseTrailerOutApplyDetailsVo.setSaleTypeKey(finBillApplicationDetailsVo.getSaleTypeKey());
baseTrailerOutApplyDetailsVo.setSaleTypeValue(finBillApplicationDetailsVo.getSaleTypeValue());
baseTrailerOutApplyDetailsVo.setSaleTypeKey(finBillApplication.getSaleTypeKey());
baseTrailerOutApplyDetailsVo.setSaleTypeValue(finBillApplication.getSaleTypeValue());
//主车信息
baseTrailerOutApplyDetailsVo.setZcSid(vehSid);
baseTrailerOutApplyDetailsVo.setZcVinNo(baseVehicle.getVinNo());
@ -315,12 +315,12 @@ public class BaseTrailerOutApplyService extends MybatisBaseService<BaseTrailerOu
baseTrailerOutApplyDetailsVo.setGcSid(query.getSid());
baseTrailerOutApplyDetailsVo.setGcVinNo(baseTrailer.getVinNo());
//业务状态
baseTrailerOutApplyDetailsVo.setBusinessState(finBillApplicationDetailsVo.getBillStateValue());
baseTrailerOutApplyDetailsVo.setBusinessState(finBillApplication.getBillStateValue());
//开票名称
baseTrailerOutApplyDetailsVo.setOpenTickSid(finBillVehicleDetailsVo.getOpenTickSid());
baseTrailerOutApplyDetailsVo.setOpenTickName(finBillVehicleDetailsVo.getOpenTickName());
//开票单位
baseTrailerOutApplyDetailsVo.setInvoiceTitle(finBillApplicationDetailsVo.getOpenTickUnitName());
baseTrailerOutApplyDetailsVo.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
//开票类型
baseTrailerOutApplyDetailsVo.setBillTypeKey(finBillVehicleDetailsVo.getBillTypeKey());
baseTrailerOutApplyDetailsVo.setBillTypeValue(finBillVehicleDetailsVo.getBillTypeValue());
@ -335,7 +335,7 @@ public class BaseTrailerOutApplyService extends MybatisBaseService<BaseTrailerOu
String billNo = getApplyCode(baseVehicle.getPurchaseSystemSid());
baseTrailerOutApplyDetailsVo.setBillNo(billNo);
//销售订单sid
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
baseTrailerOutApplyDetailsVo.setOrderSid(busSalesOrder.getSid());
//合格证附件
List<CommonAppendixVo> appAppendixList = commonAppendixService.getAppAppendixList(baseTrailer.getSid(), "挂车合格证照片");

39
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
View File

@ -1657,7 +1657,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
//推送其他应收单
for (BaseVehicleZSOutDto zcDto : zcDtos) {
OtherReceivable otherReceivable = createZSOtherReceivableQKC(baseVehicleOutApply, zcDto);
if (otherReceivable != null){
if (otherReceivable != null) {
finKingDeeFeign.draftOtherReceivableBill(otherReceivable);
}
}
@ -1742,7 +1742,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
if (StringUtils.isNotBlank(otherReceivableMoney)) {
collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney);
}else {
} else {
return null;
}
}
@ -1754,7 +1754,11 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
private SalOutStock createZSGCOrSZOutStock(List<BaseVehicleZSOutDto> gcOrSzDtos, BaseVehicleOutApply baseVehicleOutApply, String temporaryNumGcOrSz) {
SalOutStock salOutStock = new SalOutStock();
//单据编号
salOutStock.setFBillNo(baseVehicleOutApply.getBillNo() + "-" + temporaryNumGcOrSz);
if (StringUtils.isNotBlank(temporaryNumGcOrSz)){
salOutStock.setFBillNo(baseVehicleOutApply.getBillNo() + "-" + temporaryNumGcOrSz);
}else {
salOutStock.setFBillNo(baseVehicleOutApply.getBillNo());
}
//日期
salOutStock.setFDate(DateUtil.today());
//分公司id
@ -1786,7 +1790,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
fEntity.setFPrice(dto.getPrice());
if ("002".equals(dto.getMaterialTypeKey())) {
//物料编码
fEntity.setFMaterialID(dto.getMaterialCode().substring(dto.getMaterialCode().length() - 8) + "G");
fEntity.setFMaterialID(dto.getMaterialCode());
} else if ("003".equals(dto.getMaterialTypeKey())) {
//物料编码
fEntity.setFMaterialID(dto.getMaterialCode().substring(dto.getMaterialCode().length() - 8) + "SZ");
@ -2161,11 +2165,22 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
}
String payTypeKey = baseVehicleOutApply.getSaleTypeKey();
if ("001".equals(payTypeKey)) {//全款
//挂车单独出库重推
if (zcDtos.size() == 0) {
if (gcOrSzDtos.size() > 0) {
SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, "");
ResultBean<String> resultBean = finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
}
int x = 1;
String temporaryNumZc = String.format("%02d", x);
//推送所有主车销售出库单
SalOutStock salOutStock = createZSSalOutStockQKC(baseVehicleOutApply, zcDtos);
finKingDeeFeign.draftSalOutStock(salOutStock);
int x = 1;
String temporaryNumZc = String.format("%02d", x);
//推送所有上装或挂车销售出库单
if (gcOrSzDtos.size() > 0) {
SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, temporaryNumZc);
@ -2173,6 +2188,17 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
}
} else {//贷款
List<BaseVehicleZSOutDto> gcOrSzDtosDK = new ArrayList<>();
//挂车单独出库重推
if (zcDtosDK.size() == 0) {
if (gcOrSzDtos.size() > 0) {
SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtos, baseVehicleOutApply, "");
ResultBean<String> resultBean = finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
}
int j = 0;
for (BaseVehicleOut vehicleOut : zcDtosDK) {
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehicleOut.getVinSid());
@ -2197,6 +2223,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
}
}
}
return rb.success();
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java
View File

@ -102,6 +102,11 @@ public interface FinBillApplicationFeign {
@ResponseBody
public ResultBean<FinBillApplicationDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchBySid/{sid}")
@ResponseBody
public ResultBean<FinBillApplication> fetchBySid(@PathVariable("sid") String sid);
@ApiOperation("生成欠款申请PDF")
@PostMapping("/createPdf")
@ResponseBody

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java
View File

@ -96,6 +96,11 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign
return rb.setMsg("接口anrui-fin/finbillapplication/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<FinBillApplication> fetchBySid(String sid) {
return null;
}
@Override
public ResultBean<String> createPdf(String sid, String userName) {
return null;

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java
View File

@ -121,6 +121,13 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
return rb.success().setData(vo);
}
@Override
public ResultBean<FinBillApplication> fetchBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
FinBillApplication finBillApplication = finBillApplicationService.fetchBySid(sid);
return rb.success().setData(finBillApplication);
}
@Override
public ResultBean<String> createPdf(String sid, String userName) {
return finBillApplicationService.createPdf(sid,userName);

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateNewDetailsVo.java
View File

@ -17,4 +17,10 @@ public class LoanHomeVisitInvestigateNewDetailsVo implements Vo {
private List<FinanceForm> transInfo;
@ApiModelProperty("资产情况")
private List<FinanceForm> zCInfo;
@ApiModelProperty("订单信息")
private List<FinanceForm> orderInfo;
@ApiModelProperty("通过/不通过")
private String agree;
@ApiModelProperty("意见")
private String comment;
}

12
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
View File

@ -1140,6 +1140,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
public ResultBean<LoanHomeVisitInvestigateNewDetailsVo> details(String sid) {
ResultBean rb = ResultBean.fireFail();
LoanHomeVisitInvestigateNewDetailsVo loanHomeVisitInvestigateNewDetailsVo = new LoanHomeVisitInvestigateNewDetailsVo();
LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
List<FinanceForm> userInfo = new ArrayList<>();
FinanceForm financeForm1 = new FinanceForm();
financeForm1.setValue("借款人");
@ -1401,10 +1402,21 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
FinanceForm financeForm51 = new FinanceForm();
financeForm51.setValue("其他收入来源：" + loanHomevisitInvestigatePropertyDetailsVo.getOtherSourceValue());
zCInfo.add(financeForm51);
LoanHomevisitInvestigateOrderDetailsVo loanHomevisitInvestigateOrderDetailsVo = loanHomevisitInvestigateOrderService.selByMainSid(sid);
List<FinanceForm> orderInfo = new ArrayList<>();
FinanceForm financeForm52 = new FinanceForm();
financeForm52.setValue("车辆信息确认");
financeForm52.setSpanSize(2);
financeForm52.setType(1);
financeForm52.setBold(true);
orderInfo.add(financeForm52);
loanHomeVisitInvestigateNewDetailsVo.setUserInfo(userInfo);
loanHomeVisitInvestigateNewDetailsVo.setYYInfo(yYInfo);
loanHomeVisitInvestigateNewDetailsVo.setTransInfo(transInfo);
loanHomeVisitInvestigateNewDetailsVo.setZCInfo(zCInfo);
loanHomeVisitInvestigateNewDetailsVo.setOrderInfo(orderInfo);
loanHomeVisitInvestigateNewDetailsVo.setAgree(loanHomevisitInvestigate.getInvestigateValue());
loanHomeVisitInvestigateNewDetailsVo.setComment(loanHomevisitInvestigate.getRemarks());
return rb.success().setData(loanHomeVisitInvestigateNewDetailsVo);
}
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppFinanceForm.java
View File

@ -19,4 +19,7 @@ public class AppFinanceForm {
//图片
private List<String> files;
private List<AppFinanceSonForm> sonForms;
private Boolean jumpPage = false;
private AppLoanHomeVisitVo pluginPage;
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateDetailsVo.java
View File

@ -17,4 +17,10 @@ public class AppLoanHomeVisitInvestigateDetailsVo implements Vo {
private List<AppFinanceForm> transInfo;
@ApiModelProperty("资产情况")
private List<AppFinanceForm> zCInfo;
@ApiModelProperty("订单信息")
private List<AppFinanceForm> orderInfo;
@ApiModelProperty("通过/不通过")
private String agree;
@ApiModelProperty("意见")
private String comment;
}

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java
View File

@ -146,6 +146,11 @@ public class LoanHomeVisitInvestigateService {
LoanHomeVisitInvestigateNewDetailsVo loanHomeVisitInvestigateNewDetailsVo = loanHomevisitInvestigateFeign.details(sid).getData();
AppLoanHomeVisitInvestigateDetailsVo appLoanHomeVisitInvestigateDetailsVo = new AppLoanHomeVisitInvestigateDetailsVo();
BeanUtil.copyProperties(loanHomeVisitInvestigateNewDetailsVo,appLoanHomeVisitInvestigateDetailsVo);
List<AppFinanceForm> orderInfo = appLoanHomeVisitInvestigateDetailsVo.getOrderInfo();
for (AppFinanceForm appFinanceForm : orderInfo) {
appFinanceForm.setJumpPage(true);
}
return rb.success().setData(appLoanHomeVisitInvestigateDetailsVo);
}

Write Preview
Loading…
Cancel
Save