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

合同甲方取销售订单的开票单位名称

master
dimengzhe 1 year ago
parent
ada25bf59c
commit
2c41b87c04
3 changed files with 179 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  2. 42
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
  3. 40
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

84
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
View File

@ -863,6 +863,19 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} }
map.put("invoiceType", busSalesOrder.getBillingType());//开票类型 map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
} }
/*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName());
} else {
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}
}*/
if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
map.put("createOrgName",busSalesOrder.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(dto.getCreateOrgName())) { if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName()); map.put("createOrgName", dto.getCreateOrgName());
} else { } else {
@ -873,6 +886,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} }
} }
} }
}
if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) { if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
//获取模板 //获取模板
ftl = "existingvehicles"; ftl = "existingvehicles";
@ -985,6 +999,19 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} }
map.put("invoiceType", busSalesOrder.getBillingType());//开票类型 map.put("invoiceType", busSalesOrder.getBillingType());//开票类型
} }
/*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName());
} else {
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}
}*/
if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
map.put("createOrgName",busSalesOrder.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(dto.getCreateOrgName())) { if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName()); map.put("createOrgName", dto.getCreateOrgName());
} else { } else {
@ -995,6 +1022,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} }
} }
} }
}
if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) { if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
//获取模板 //获取模板
ftl = "existingvehicles"; ftl = "existingvehicles";
@ -1413,6 +1441,19 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String idNo = crmCustomerTempVo.getIDNumber(); String idNo = crmCustomerTempVo.getIDNumber();
map.put("customerName", appOrderDetailsVo.getName()); map.put("customerName", appOrderDetailsVo.getName());
map.put("idNo", idNo); map.put("idNo", idNo);
/* if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName());
} else {
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}
}*/
if(StringUtils.isNotBlank(appOrderDetailsVo.getCompanyInvoicingName())){
map.put("createOrgName",appOrderDetailsVo.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(dto.getCreateOrgName())) { if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName()); map.put("createOrgName", dto.getCreateOrgName());
} else { } else {
@ -1423,6 +1464,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} }
} }
} }
}
String ftl = "receiveCar"; String ftl = "receiveCar";
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
//生成word文件名 //生成word文件名
@ -1560,6 +1602,19 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} }
} }
map.put("contractNo", "D" + map.get("contractNo")); map.put("contractNo", "D" + map.get("contractNo"));
/*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName());
} else {
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}
}*/
if(StringUtils.isNotBlank(appOrderDetailsVo.getCompanyInvoicingName())){
map.put("createOrgName",appOrderDetailsVo.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(dto.getCreateOrgName())) { if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName()); map.put("createOrgName", dto.getCreateOrgName());
} else { } else {
@ -1570,6 +1625,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} }
} }
} }
}
CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid()); CommonContract commonContract = baseMapper.selectByBusSidss(dto.getBusSid());
if (commonContract != null) { if (commonContract != null) {
String date = DateUtil.today(); String date = DateUtil.today();
@ -1661,6 +1717,19 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
map.put("day", day); map.put("day", day);
} }
BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid()); BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid());
/*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName());
} else {
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}
}*/
if(StringUtils.isNotBlank(appOrderDetailsVo.getCompanyInvoicingName())){
map.put("createOrgName",appOrderDetailsVo.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(dto.getCreateOrgName())) { if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName()); map.put("createOrgName", dto.getCreateOrgName());
} else { } else {
@ -1671,6 +1740,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} }
} }
} }
}
if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) { if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
//获取模板 //获取模板
ftl = "dai_existingvehicles"; ftl = "dai_existingvehicles";
@ -1762,6 +1832,19 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
map.put("day", day); map.put("day", day);
} }
BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid()); BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid());
/*if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName());
} else {
if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}
}*/
if(StringUtils.isNotBlank(appOrderDetailsVo.getCompanyInvoicingName())){
map.put("createOrgName",appOrderDetailsVo.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(dto.getCreateOrgName())) { if (StringUtils.isNotBlank(dto.getCreateOrgName())) {
map.put("createOrgName", dto.getCreateOrgName()); map.put("createOrgName", dto.getCreateOrgName());
} else { } else {
@ -1772,6 +1855,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
} }
} }
} }
}
if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) { if ("1".equals(busSalesOrder.getType()) && (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum()) || "0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
//获取模板 //获取模板
ftl = "dai_existingvehicles"; ftl = "dai_existingvehicles";

42
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
View File

@ -1273,7 +1273,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
} }
} }
if(showNotice){ if(showNotice){
// allDownloadUrl = getFileUrlNew(dto); allDownloadUrl = getFileUrlNew(dto);
} }
return allDownloadUrl; return allDownloadUrl;
} }
@ -1302,12 +1302,22 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
if (!openTickSid.equals(busSalesOrder.getAffiliatedCompanySid())) { if (!openTickSid.equals(busSalesOrder.getAffiliatedCompanySid())) {
BusBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0); BusBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
//生成开票申请书 //生成开票申请书
/*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}*/
if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
map.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) { if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
} }
} }
}
map.put("contractNo", busSalesOrder.getContractNo()); map.put("contractNo", busSalesOrder.getContractNo());
List<BillFileVo> list = new ArrayList<>(); List<BillFileVo> list = new ArrayList<>();
//====================================主车开始 //====================================主车开始
@ -1380,12 +1390,22 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称 carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
} }
carMap.put("contractNo", "D" + map.get("contractNo")); carMap.put("contractNo", "D" + map.get("contractNo"));
/*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}*/
if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
carMap.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) { if (invoicingDetailsVoResultBean.getData() != null) {
carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
} }
} }
}
carMap.put("date", date); carMap.put("date", date);
List<CarContractListVo> carContractListVos = new ArrayList<>(); List<CarContractListVo> carContractListVos = new ArrayList<>();
for (BusBillVehicleDto salesOrderVehicle : sameOpenTickSidList) { for (BusBillVehicleDto salesOrderVehicle : sameOpenTickSidList) {
@ -1523,12 +1543,22 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
Map<String, Object> carMap = new HashMap<>(); Map<String, Object> carMap = new HashMap<>();
BusBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0); BusBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
//生成开票申请书 //生成开票申请书
/*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}*/
if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
map.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) { if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
} }
} }
}
map.put("contractNo", busSalesOrder.getContractNo()); map.put("contractNo", busSalesOrder.getContractNo());
List<BillFileVo> list = new ArrayList<>(); List<BillFileVo> list = new ArrayList<>();
//====================================主车开始 //====================================主车开始
@ -1598,12 +1628,22 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称 carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
} }
carMap.put("contractNo", "D" + map.get("contractNo")); carMap.put("contractNo", "D" + map.get("contractNo"));
/*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}*/
if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
carMap.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) { if (invoicingDetailsVoResultBean.getData() != null) {
carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
} }
} }
}
carMap.put("date", date); carMap.put("date", date);
List<CarContractListVo> carContractListVos = new ArrayList<>(); List<CarContractListVo> carContractListVos = new ArrayList<>();
for (BusBillVehicleDto salesOrderVehicle : sameOpenTickSidList) { for (BusBillVehicleDto salesOrderVehicle : sameOpenTickSidList) {

40
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -1073,12 +1073,22 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
if (!openTickSid.equals(busSalesOrder.getAffiliatedCompanySid())) { if (!openTickSid.equals(busSalesOrder.getAffiliatedCompanySid())) {
FinBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0); FinBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
//生成开票申请书 //生成开票申请书
/*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}*/
if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
map.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) { if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
} }
} }
}
map.put("contractNo", busSalesOrder.getContractNo()); map.put("contractNo", busSalesOrder.getContractNo());
List<BillFileVo> list = new ArrayList<>(); List<BillFileVo> list = new ArrayList<>();
//====================================主车开始 //====================================主车开始
@ -1151,12 +1161,22 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称 carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
} }
carMap.put("contractNo", "D" + map.get("contractNo")); carMap.put("contractNo", "D" + map.get("contractNo"));
/*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}*/
if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
carMap.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) { if (invoicingDetailsVoResultBean.getData() != null) {
carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
} }
} }
}
carMap.put("date", date); carMap.put("date", date);
List<CarContractListVo> carContractListVos = new ArrayList<>(); List<CarContractListVo> carContractListVos = new ArrayList<>();
for (FinBillVehicleDto salesOrderVehicle : sameOpenTickSidList) { for (FinBillVehicleDto salesOrderVehicle : sameOpenTickSidList) {
@ -1298,12 +1318,22 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> carMap = new HashMap<>(); Map<String, Object> carMap = new HashMap<>();
FinBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0); FinBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
//生成开票申请书 //生成开票申请书
/*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}*/
if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
map.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) { if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
} }
} }
}
map.put("contractNo", busSalesOrder.getContractNo()); map.put("contractNo", busSalesOrder.getContractNo());
List<BillFileVo> list = new ArrayList<>(); List<BillFileVo> list = new ArrayList<>();
//====================================主车开始 //====================================主车开始
@ -1373,12 +1403,22 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
carMap.put("invoiceName", finCompanyInvoicing.getName());//开票名称 carMap.put("invoiceName", finCompanyInvoicing.getName());//开票名称
} }
carMap.put("contractNo", "D" + map.get("contractNo")); carMap.put("contractNo", "D" + map.get("contractNo"));
/*if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) {
carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}
}*/
if(StringUtils.isNotBlank(busSalesOrder.getCompanyInvoicingName())){
carMap.put("createOrgName", busSalesOrder.getCompanyInvoicingName());
}else{
if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
if (invoicingDetailsVoResultBean.getData() != null) { if (invoicingDetailsVoResultBean.getData() != null) {
carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
} }
} }
}
carMap.put("date", date); carMap.put("date", date);
List<CarContractListVo> carContractListVos = new ArrayList<>(); List<CarContractListVo> carContractListVos = new ArrayList<>();
for (FinBillVehicleDto salesOrderVehicle : sameOpenTickSidList) { for (FinBillVehicleDto salesOrderVehicle : sameOpenTickSidList) {

Write Preview
Loading…
Cancel
Save