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

问题修改

master
God 2 years ago
parent
e228428b67
commit
5ee52fa98b
12 changed files with 180 additions and 43 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. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDetailsVo.java
  2. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java
  3. 78
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  4. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java
  5. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java
  6. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  7. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java
  8. 7
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java
  9. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/FinBillTrailerVo.java
  10. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java
  11. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java
  12. 107
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDetailsVo.java
View File

@ -65,6 +65,8 @@ public class FinBillTrailerDetailsVo implements Vo {
private String openTickSid; // 开票名称sid
@ApiModelProperty("开票名称")
private String openTickName; // 开票名称
@ApiModelProperty("开票信息")
private String invoiceInfo;
@ApiModelProperty("开票申请单sid")
private String billAppSid; // 开票申请单sid
@ApiModelProperty("单台开票金额")

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java
View File

@ -67,6 +67,8 @@ public class FinBillTrailerVo implements Vo {
private String openTickName; // 开票名称
@ApiModelProperty("开票申请单sid")
private String billAppSid; // 开票申请单sid
@ApiModelProperty("开票信息")
private String invoiceInfo;
@ApiModelProperty("单台开票金额")
private String oneBillMoney; // 单台开票金额

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

@ -158,7 +158,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getOrgPath())){
if (StringUtils.isNotBlank(query.getOrgPath())) {
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
query.setUseOrgSid(useOrgSid);
}
@ -237,7 +237,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
finBillTrailer.setBillAppSid(finBillApplication.getSid());
for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
@ -358,7 +358,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
finBillTrailer.setBillAppSid(dtoSid);
for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
@ -392,7 +392,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillApplicationDetailsVo> finBillApplicationVos = baseMapper.selectByContractNo(contractNo);
if (finBillApplicationVos != null && finBillApplicationVos.size() > 0) {
FinBillApplicationDetailsVo finBillApplicationVo = finBillApplicationVos.get(0);
if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())){
if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())) {
entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney()));
}
}
@ -403,10 +403,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid);
if (finBillTrailerVos.size() > 0) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
FinBillVehicleVo finBillVehicleVo = finBillVehicleService.selByVinNo(finBillTrailerVo.getVinNo());
finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData();
List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){
if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
finBillTrailerVo.setHgzImageUrl(commonAppendixVo.getFileUrl());
}
}
@ -415,7 +417,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
} else {
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finBillVehicleVo.getVinNo(), entity.getUseOrgSid()).getData();
TraliveredVo data = baseTrailerFeign.trailerList(baseVehicle.getSid(),entity.getContractNo()).getData();
TraliveredVo data = baseTrailerFeign.trailerList(baseVehicle.getSid(), entity.getContractNo()).getData();
List<TrailerVo> trailerVoList = data.getList();
for (TrailerVo trailerVo : trailerVoList) {
FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
@ -430,7 +432,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(trailerVo.getTrailerVinNo()).getData();
List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){
if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
finBillTrailerVo.setHgzImageUrl(commonAppendixVo.getFileUrl());
}
}
@ -765,7 +767,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
if (finBillTrailerVos != null){
if (finBillTrailerVos != null) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
@ -792,8 +794,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney == null){
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(),finBillApplication.getOneBillMoney().toString());
if (oneBillMoney == null) {
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
}
} else {
//极光推送
@ -991,10 +993,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
ResultBean rb = ResultBean.fireFail();
String contractNo = dto.getContractNo();
List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
if (finBillApplicationDetailsVos != null){
if (finBillApplicationDetailsVos != null) {
for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
String nodeState = finBillApplicationDetailsVo.getNodeState();
if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) &&!"终止".equals(nodeState)&&!"发起申请".equals(nodeState)){
if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) {
return rb.setMsg("该合同已有开票/欠款开票申请正在审批中，不可提交");
}
}
@ -1523,7 +1525,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
finBillTrailer.setBillAppSid(finBillApplication.getSid());
for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
@ -1533,7 +1535,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillTrailerService.save(finBillTrailer);
}
//附件信息
if (khkpsqsApplicationAppendxs.size() > 0){
if (khkpsqsApplicationAppendxs.size() > 0) {
for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@ -1545,7 +1547,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (kpxxqrsApplicationAppendxs.size() > 0){
if (kpxxqrsApplicationAppendxs.size() > 0) {
for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@ -1557,7 +1559,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (cldjhtApplicationAppendxs.size() > 0){
if (cldjhtApplicationAppendxs.size() > 0) {
for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@ -1569,7 +1571,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillFileService.saveOrUpdateDto(finBillFileDto);
}
}
if (zjApplicationAppendxs.size() > 0){
if (zjApplicationAppendxs.size() > 0) {
for (FinBillFileDto finBillFileDto : zjApplicationAppendxs) {
String filePath = finBillFileDto.getFileUrl();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
@ -1653,7 +1655,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
finBillTrailer.setBillAppSid(dtoSid);
for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())){
if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
@ -1669,10 +1671,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
ResultBean rb = ResultBean.fireFail();
String contractNo = dto.getContractNo();
List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
if (finBillApplicationDetailsVos != null){
if (finBillApplicationDetailsVos != null) {
for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
String nodeState = finBillApplicationDetailsVo.getNodeState();
if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) &&!"终止".equals(nodeState)&&!"发起申请".equals(nodeState)){
if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) {
return rb.setMsg("该合同已有开票/欠款开票申请正在审批中，不可提交");
}
}
@ -1782,8 +1784,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney == null){
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(),finBillApplication.getOneBillMoney().toString());
if (oneBillMoney == null) {
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
}
} else {
//极光推送
@ -1960,17 +1962,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
public PagerVo<FinBillApplicationVo> listPageQK(PagerQuery<FinBillApplicationQuery> pq) {
FinBillApplicationQuery query = pq.getParams();
QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getOrgPath())){
if (StringUtils.isNotBlank(query.getOrgPath())) {
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
query.setUseOrgSid(useOrgSid);
}
qw.eq("fba.billStateKey", "003");
qw.eq("fba.useOrgSid", query.getUseOrgSid());
qw.eq("fba.createBySid", query.getCreateBySid());
if ("1".equals(query.getType())){
qw.eq("fba.nodeState","待提交");
}else if ("2".equals(query.getType())){
qw.ne("fba.nodeState","待提交");
if ("1".equals(query.getType())) {
qw.eq("fba.nodeState", "待提交");
} else if ("2".equals(query.getType())) {
qw.ne("fba.nodeState", "待提交");
}
if (StringUtils.isNotBlank(query.getSaleTypeKey())) {
qw.eq("fba.saleTypeKey", query.getSaleTypeKey());
@ -2064,15 +2066,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
public ResultBean<FinBillApplicationDetailsVo> appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) {
ResultBean rb = ResultBean.fireFail();
String sid = query.getSid();
String userSid = query.getUserSid();
String contractNo = query.getContractNo();
String orgPath = query.getOrgPath();
String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
String deptName = sysOrganizationFeign.fetchBySid(deptSid).getData().getName();
FinBillApplicationDetailsVo finBillApplicationDetailsVo = new FinBillApplicationDetailsVo();
if (StringUtils.isBlank(sid)){
finBillApplicationDetailsVo.setCreateBySid(userSid);
SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
if (StringUtils.isBlank(sid)) {
String orgPath = query.getOrgPath();
String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
String deptName = sysOrganizationFeign.fetchBySid(deptSid).getData().getName();
finBillApplicationDetailsVo.setCreateBySid(query.getUserSid());
SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
finBillApplicationDetailsVo.setCreateByName(sysUserVo.getName());
finBillApplicationDetailsVo.setDeptSid(deptSid);
finBillApplicationDetailsVo.setDeptName(deptName);
@ -2081,15 +2081,15 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillApplicationDetailsVo.setStaffName(sysUserVo.getName());
finBillApplicationDetailsVo.setSaleDeptSid(deptSid);
finBillApplicationDetailsVo.setSaleDeptName(deptName);
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(query.getContractNo()).getData();
finBillApplicationDetailsVo.setSaleTypeKey(busSalesOrder.getPayTypeKey());
finBillApplicationDetailsVo.setSaleTypeValue(busSalesOrder.getPayType());
finBillApplicationDetailsVo.setContractNo(contractNo);
CommonContract commonContract = commonContractFeign.selectByNo(contractNo).getData();
finBillApplicationDetailsVo.setContractNo(query.getContractNo());
CommonContract commonContract = commonContractFeign.selectByNo(query.getContractNo()).getData();
finBillApplicationDetailsVo.setOpenTickUnitName(commonContract.getPartyA());
finBillApplicationDetailsVo.setCustomerSid(commonContract.getCustomerSid());
finBillApplicationDetailsVo.setCustomerName(commonContract.getPartyB());
}else {
} else {
finBillApplicationDetailsVo = fetchDetailsVoBySid(sid);
}
return rb.success().setData(finBillApplicationDetailsVo);

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java
View File

@ -76,4 +76,7 @@ public interface FinBillVehicleMapper extends BaseMapper<FinBillVehicle> {
@Update("UPDATE fin_bill_vehicle SET state = 0 WHERE billAppSid = #{sid}")
void updateByMainSid(String sid);
@Select("select * from fin_bill_vehicle where vinNo = #{vinNo}")
FinBillVehicleVo selByVinNo(String vinNo);
}

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java
View File

@ -141,4 +141,8 @@ public class FinBillVehicleService extends MybatisBaseService<FinBillVehicleMapp
public void updateByMainSid(String sid) {
baseMapper.updateByMainSid(sid);
}
public FinBillVehicleVo selByVinNo(String vinNo) {
return baseMapper.selByVinNo(vinNo);
}
}

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
View File

@ -338,7 +338,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
vo.setGuidedPrice(guidedPrice + "/" + manufactorSettlementPrice);
String updateDate = DateUtil.formatDate(baseVehmodelVo.getModifyTime());
String nowDate = DateUtil.formatDate(new Date());
vo.setNewUpdateDate(DateUtil.formatDate(baseVehmodelVo.getModifyTime()));
if (StringUtils.isBlank(guidedPrice) && StringUtils.isBlank(manufactorSettlementPrice)){
vo.setNewUpdateDate("");
}else {
vo.setNewUpdateDate(DateUtil.formatDate(baseVehmodelVo.getModifyTime()));
}
String[] updateDates = updateDate.split("-");
String[] nowDates = nowDate.split("-");
if (updateDates[0].equals(nowDates[0]) && updateDates[1].equals(nowDates[1])){

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java
View File

@ -33,6 +33,9 @@ public class AdvanceInvoicePageVo implements Vo {
private Boolean showUpdateBtn;
@ApiModelProperty("是否显示删除按钮")
private Boolean showDeleteBtn;
@ApiModelProperty("车型")
private String model;
@ApiModelProperty("销售类型")
private String type;
}

7
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java
View File

@ -61,7 +61,6 @@ import javax.validation.Valid;
fallback = AppBusAdvanceGinvoiceapplyFeignFallback.class)
public interface AppBusAdvanceGinvoiceapplyFeign {
@ApiOperation("手机端-获取欠款开票列表")
@PostMapping("/getAdvanceInvoiceList")
@ResponseBody
@ -77,6 +76,11 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
@ResponseBody
public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query);
@ApiOperation("手机端-欠款开票详情")
@GetMapping("/detailAdvancelnvoice")
@ResponseBody
public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(@RequestParam("sid") String sid);
@ApiOperation("移动端-保存欠款开票申请")
@PostMapping("/saveAdvanceInvoice")
@ResponseBody
@ -87,7 +91,6 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
@ResponseBody
public ResultBean deleteAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query);
@ApiOperation("提交流程")
@PostMapping("/submitAdvanceInvoiceInfo")
@ResponseBody

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/FinBillTrailerVo.java
View File

@ -62,6 +62,8 @@ public class FinBillTrailerVo implements Vo {
private String openTickName; // 开票名称
@ApiModelProperty("开票申请单sid")
private String billAppSid; // 开票申请单sid
@ApiModelProperty("开票信息")
private String invoiceInfo;
@ApiModelProperty("单台开票金额")
private String oneBillMoney; // 单台开票金额
@ApiModelProperty("合格证图片")

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java
View File

@ -64,6 +64,8 @@ public class FinBillTrailerVo implements Vo {
private String openTickName; // 开票名称
@ApiModelProperty("开票申请单sid")
private String billAppSid; // 开票申请单sid
@ApiModelProperty("开票信息")
private String invoiceInfo;
@ApiModelProperty("单台开票金额")
private String oneBillMoney; // 单台开票金额
@ApiModelProperty("合格证图片")

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java
View File

@ -73,6 +73,11 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
return appBusAdvanceGinvoiceapplyService.initAdvanceInvoice(query);
}
@Override
public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(String sid) {
return appBusAdvanceGinvoiceapplyService.detailAdvancelnvoice(sid);
}
@Override
public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) {
return appBusAdvanceGinvoiceapplyService.saveAdvanceInvoice(dto);

107
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
View File

@ -122,6 +122,8 @@ public class AppBusAdvanceGinvoiceapplyService {
advanceInvoicePageVo.setReason(record.getArrearsOpenYYValue());
advanceInvoicePageVo.setDate(record.getApplyDate());
advanceInvoicePageVo.setCustomerName(record.getCustomerName());
advanceInvoicePageVo.setModel(record.getModelName());
advanceInvoicePageVo.setType(record.getSaleTypeValue());
if (record.getNodeState().equals("待提交")){
advanceInvoicePageVo.setShowUpdateBtn(true);
advanceInvoicePageVo.setShowDeleteBtn(true);
@ -568,4 +570,109 @@ public class AppBusAdvanceGinvoiceapplyService {
}
return rb.success().setData(data);
}
public ResultBean<AdvanceInvoiceInfoVo> detailAdvancelnvoice(String sid) {
ResultBean<AdvanceInvoiceInfoVo> rb = ResultBean.fireFail();
AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo();
AppBillApplicationDetailsQKQuery appBillApplicationDetailsQKQuery = new AppBillApplicationDetailsQKQuery();
appBillApplicationDetailsQKQuery.setSid(sid);
ResultBean<FinBillApplicationDetailsVo> resultBean = finBillApplicationFeign.appQKFetchDetailsBySid(appBillApplicationDetailsQKQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
BeanUtil.copyProperties(finBillApplicationDetailsVo, vo);
vo.setReasonKey(finBillApplicationDetailsVo.getArrearsOpenYYKey());
vo.setReasonValue(finBillApplicationDetailsVo.getArrearsOpenYYValue());
vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate());
vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice());
vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney());
vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath());
vo.setSaleType(finBillApplicationDetailsVo.getSaleTypeValue());
vo.setSellerDept(finBillApplicationDetailsVo.getSaleDeptName());
vo.setSellerName(finBillApplicationDetailsVo.getStaffName());
vo.setInvoicingUnit(finBillApplicationDetailsVo.getOpenTickUnitName());
vo.setName(finBillApplicationDetailsVo.getCustomerName());
vo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney());
vo.setOpenTickSid(finBillApplicationDetailsVo.getOpenTickSid());
vo.setOpenTickName(finBillApplicationDetailsVo.getOpenTickName());
vo.setContractId(finBillApplicationDetailsVo.getContractNo());
vo.setDate(finBillApplicationDetailsVo.getApplyDate());
vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid());
vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
//车辆信息
List<AppCarListVo> vinListVos = new ArrayList<>();
List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles();
if (finBillVehicles != null){
for (FinBillVehicleVo finBillVehicle : finBillVehicles) {
AppCarListVo vinListVo = new AppCarListVo();
vinListVo.setVin(finBillVehicle.getVinNo());
vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey());
vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue());
vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey());
vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue());
vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
vinListVos.add(vinListVo);
}
}
vo.setVinList(vinListVos);
//挂车信息
List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo> finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers();
List<com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo> finBillTrailerVos = new ArrayList<>();
if (finBillTrailers != null && finBillTrailers.size() > 0){
for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) {
com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo);
String hgzImageUrl = finBillTrailer.getHgzImageUrl();
List<String> files = new ArrayList<>();
files.add(hgzImageUrl);
finBillTrailerVo.setFiles(files);
finBillTrailerVos.add(finBillTrailerVo);
}
}
vo.setFinBillTrailers(finBillTrailerVos);
//附件信息
List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs();
List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs();
List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs();
List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs();
List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
List<String> registerContractImages = new ArrayList<>();//车辆登记合同
List<String> idCardImages = new ArrayList<>();
if (zjApplicationAppendxs != null){
for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
idCardImages.add(zjApplicationAppendx.getFileUrl());
}
}
if (khkpsqsApplicationAppendxs != null){
for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl());
}
}
if (kpxxqrsApplicationAppendxs != null){
for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) {
invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl());
}
}
if (cldjhtApplicationAppendxs != null){
for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
}
}
vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
vo.setRegisterContractImages(registerContractImages);
vo.setIdCardImages(idCardImages);
BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){
vo.setIsCanEdit(false);
vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
}else {
vo.setIsCanEdit(true);
}
return rb.success().setData(vo);
}
}
Write Preview
Loading…
Cancel
Save