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

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
6fa449bd98 cd299e1fa5
commit
0cc0065901
1 changed files with 107 additions and 94 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. 201
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

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

@ -71,6 +71,7 @@ import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto;
import com.yxt.anrui.fin.biz.finbillapplicationpublic.FinBillApplicationPublicService;
import com.yxt.anrui.fin.biz.finbillfile.FinBillFileService;
@ -210,7 +211,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
qw.like("fba.createByName", query.getCreateByName());
}
//移动端条件
if (StringUtils.isNotBlank(query.getName())){
if (StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("fba.customerName", query.getName()).or().like("fba.contractNo", query.getName()));
}
String applyStartDate = query.getApplyStartDate();
@ -240,7 +241,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
String vinNo = finBillVehicleVo.getVinNo();
vinNos = vinNos + vinNo + ",";
}
record.setVinNo(vinNos.substring(0,vinNos.lastIndexOf(",")));
record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
}
PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
return p;
@ -427,17 +428,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);
String contractNo = entity.getContractNo();
BigDecimal oneBillMoney = entity.getOneBillMoney();
if (oneBillMoney != null){
if (oneBillMoney != null) {
entity.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size())));
}
FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo();
BeanUtil.copyProperties(entity, vo);
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
vo.setBusSalesOrderSid(busSalesOrder.getSid());
if (finBillVehicleVos != null){
if (finBillVehicleVos != null) {
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(finBillVehicleVo.getVehSid()).getData();
if (baseVehicleCertificateVo != null){
if (baseVehicleCertificateVo != null) {
List<String> clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
finBillVehicleVo.setCertificatePhoto(clhgeImages);
}
@ -458,7 +459,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
}
finBillTrailerVo.setHgzImageUrl(hgzImageUrls);
if (finBillTrailerVo.getOneBillMoney() == null){
if (finBillTrailerVo.getOneBillMoney() == null) {
finBillTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice());
}
}
@ -589,60 +590,29 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("主车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillVehicleVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
finVehicleInvoiceDto.setTaxpayerNo(baseDistributorListVo.getRegistNum());
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
if (finBillTrailerVos != null) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(finBillVehicleVo.getVehSid());
if (finVehicleInvoice == null) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
String gcVinNo = finBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
finVehicleInvoiceDto.setVIN(gcVinNo);
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车");
finVehicleInvoiceDto.setVehicleType("主车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillTrailerVo.getOpenTickSid()).getData();
BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillVehicleVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
@ -652,6 +622,43 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}
if (finBillTrailerVos != null) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
String gcVinNo = finBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(baseTrailerDetailsVo.getSid());
if (finVehicleInvoice == null) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
finVehicleInvoiceDto.setVIN(gcVinNo);
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillTrailerVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
finVehicleInvoiceDto.setTaxpayerNo(baseDistributorListVo.getRegistNum());
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}
}
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney == null) {
@ -1389,10 +1396,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
//单台欠款金额
BigDecimal qkMoneyOne = unYs.subtract(seYs);
//欠款金额合计
if (finBillVehicles.size() > 0){
if (finBillVehicles.size() > 0) {
BigDecimal qkMoneyTotal = qkMoneyOne.multiply(new BigDecimal(finBillVehicles.size()));
finBillApplication.setArrearsMoney(qkMoneyTotal.toString());
}else {
} else {
finBillApplication.setArrearsMoney("");
}
//单台开票金额
@ -1567,7 +1574,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
List<FinBillFileDto> fjApplicationAppendxs = dto.getFjApplicationAppendxs();
if (StringUtils.isBlank(dtoSid)) {//新增
if ("是".equals(dto.getIsLQOrigInvoice())){
if ("是".equals(dto.getIsLQOrigInvoice())) {
return rb.setMsg("请选择未领取发票原件的申请");
}
String qkkpBillNo = dto.getBillNo();
@ -1810,60 +1817,29 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("主车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillVehicleVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
finVehicleInvoiceDto.setTaxpayerNo(baseDistributorListVo.getRegistNum());
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
if (finBillTrailerVos != null) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(finBillVehicleVo.getVehSid());
if (finVehicleInvoice == null) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
String gcVinNo = finBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
finVehicleInvoiceDto.setVIN(gcVinNo);
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车");
finVehicleInvoiceDto.setVehicleType("主车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillTrailerVo.getOpenTickSid()).getData();
BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillVehicleVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
@ -1873,6 +1849,43 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}
if (finBillTrailerVos != null) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
String gcVinNo = finBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(baseTrailerDetailsVo.getSid());
if (finVehicleInvoice == null) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
finVehicleInvoiceDto.setVIN(gcVinNo);
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillTrailerVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
finVehicleInvoiceDto.setTaxpayerNo(baseDistributorListVo.getRegistNum());
finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}
}
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney == null) {
@ -1922,7 +1935,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
bv.setOrgSidPath(finBillApplication.getOrgSidPath());
//判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
if("Activity_1aja6s0".equals(bv.getTaskDefKey())){//分公司销售内勤的节点id
if ("Activity_1aja6s0".equals(bv.getTaskDefKey())) {//分公司销售内勤的节点id
//分公司销售内勤审批->销售部经理审批
List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
@ -2271,7 +2284,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
public ResultBean companyToDivisionOperateQK(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
FinBillApplication finBillApplication = fetchBySid(bv.getBusinessSid());
if (finBillApplication.getIsLQOrigInvoice().equals("否")){
if (finBillApplication.getIsLQOrigInvoice().equals("否")) {
ResultBean resultBean = completeQK(bv);
return resultBean;
}
@ -2512,7 +2525,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
variables.put("app", appMap);
bv.setFormVariables(variables);
bv.setOrgSidPath(finBillApplication.getOrgSidPath());
if("Activity_1aja6s0".equals(bv.getTaskDefKey())){//分公司销售内勤的节点id
if ("Activity_1aja6s0".equals(bv.getTaskDefKey())) {//分公司销售内勤的节点id
//分公司销售内勤审批->销售部经理审批
List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();

Write Preview
Loading…
Cancel
Save