Browse Source

出库开票初始化添加字段

master
dimengzhe 1 year ago
parent
commit
139dbf565e
  1. 9
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDetailsVo.java
  2. 29
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
  3. 4
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

9
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDetailsVo.java

@ -163,4 +163,13 @@ public class BusBillApplicationDetailsVo implements Vo {
@ApiModelProperty("出库申请sid")
private String ckSid;
// 下载地址
private String allDownloadUrl;
// 显示生成合同 下载合同按钮 全款/非耽误为true
private int contractBtns;
// 销售订单开票名称
private String orderInvoiceSid;
// 销售订单开票价格
private String orderInvoicePrice;
}

29
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java

@ -495,6 +495,35 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
if (data != null) {
vo.setShowValueCustomer(!data.getSingleFinalPrice().equals(entity.getOneBillMoney()));
}
//生成的合同下载地址
String allDownloadUrl = "";
if(StringUtils.isNotBlank(entity.getFileUrl())){
allDownloadUrl = docPdfComponent.getPrefixTemplateUrl()+entity.getFileUrl();
vo.setAllDownloadUrl(allDownloadUrl);
}
int contractBtns = 0;
//根据合同号查询销售订单数据
busSalesOrder = baseMapper.selectByContract(contractNo);
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData();
BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid());
BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
contractBtns = 1;
}else{
if(StringUtils.isNotBlank(loanSolutions.getTypeKey())){
contractBtns = 2;
}
}
vo.setContractBtns(contractBtns);
//销售订单开票sid
if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
vo.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
}
if(loanSolutions != null){
if(StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())){
vo.setOrderInvoicePrice(loanSolutions.getMainVehicleAmount());
}
}
return vo;
}

4
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@ -373,6 +373,10 @@ public class InvoicedService {
billApplicationIInfoVo.setDate(data.getApplyDate());
billApplicationIInfoVo.setUserSid(data.getCreateBySid());
billApplicationIInfoVo.setPublishInfo(data.getDeptName() + "-" + data.getCreateByName());
billApplicationIInfoVo.setAllDownloadUrl(data.getAllDownloadUrl());
billApplicationIInfoVo.setContractBtns(data.getContractBtns());
billApplicationIInfoVo.setOrderInvoiceSid(data.getOrderInvoiceSid());
billApplicationIInfoVo.setOrderInvoicePrice(data.getOrderInvoicePrice());
//根据合同查询销售订单
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(data.getContractNo()).getData();
billApplicationIInfoVo.setBusSalesOrderSid(busSalesOrder.getSid());

Loading…
Cancel
Save