diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 3bde0fae7c..682e944d24 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -1779,14 +1779,18 @@ public class BaseVehicleOutService extends MybatisBaseService vinList; @ApiModelProperty("开票挂车信息") - private List finBillTrailers; // 开票挂车信息 + private List busBillTrailers; // 开票挂车信息 @ApiModelProperty("开票状态") private String billState; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDetailsVo.java index 5edac65351..fa11c2a53a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDetailsVo.java @@ -159,4 +159,7 @@ public class BusBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple private List cldjhtApplicationAppendxs; // 车辆登记合同 @ApiModelProperty("欠款领票附件") private List arrearsCollectionAppendxs; + + @ApiModelProperty("出库申请sid") + private String cksqSid; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java index 4ac5a1d0cc..6ffc00f63c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java @@ -126,6 +126,8 @@ public class BusBillApplicationDto implements Dto { private String reason; @ApiModelProperty("欠款开票单据编号（欠款领票使用）") private String qkkpBillNo; + @ApiModelProperty("出库申请sid") + private String ckSid; @ApiModelProperty("开票车辆信息") private List busBillVehicles; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java index 2ec5058e6f..04ba79b088 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java @@ -47,8 +47,8 @@ public interface BusBillApplicationFeign { @ResponseBody public ResultBean save(@RequestBody BusBillApplicationDto dto); - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") + @ApiOperation("根据出库申请sid查询开票信息") + @GetMapping("/fetchDetailByCkSid/{ckSid}") @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + public ResultBean fetchDetailByCkSid(@PathVariable("ckSid") String ckSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java index e27043dcd6..39c93f950e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java @@ -37,7 +37,8 @@ public class BusBillApplicationFeignFallback implements BusBillApplicationFeign } @Override - public ResultBean fetchDetailsBySid(String sid) { + public ResultBean fetchDetailByCkSid(String ckSid) { return null; } + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java index edda9175dc..c2bcbf263e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java @@ -102,6 +102,7 @@ public class AppDeliveredDetailsVo implements Vo { private String taskDefKey; private boolean showLoanUser; - + @ApiModelProperty("是否开票（0开票，1不开票）") + private String isInvoicing; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index 57d54b621f..2981e745b2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -208,7 +208,7 @@ public interface BusDeliveredApplyFeign { @ApiOperation("手机端-保存 出库申请") @PostMapping("/saveRetrievalApplyInfo") @ResponseBody - public ResultBean saveRetrievalApplyInfo(@RequestBody AppDeliveredApplyDto appDeliveredApplyDto); + public ResultBean saveRetrievalApplyInfo(@RequestBody AppDeliveredApplyDto appDeliveredApplyDto); @ApiOperation("App-提交出库审批流程") @PostMapping("/submitAppDeliveredApply") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java index ce4217a047..3ac4b260a3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java @@ -58,9 +58,9 @@ public class BusBillApplicationRest implements BusBillApplicationFeign { } @Override - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + public ResultBean fetchDetailByCkSid(@PathVariable("ckSid") String ckSid) { ResultBean rb = ResultBean.fireFail(); - BusBillApplicationDetailsVo vo = busBillApplicationService.fetchDetailsVoBySid(sid); + BusBillApplicationDetailsVo vo = busBillApplicationService.fetchDetailByCkSid(ckSid); return rb.success().setData(vo); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java index cd470a34f9..d16ea2885a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java @@ -277,7 +277,12 @@ public class BusBillApplicationService extends MybatisBaseService busBillVehicleVos = busBillVehicleService.fetchVehBySid(sid); String contractNo = entity.getContractNo(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java index 67e8a1a5c6..bb6ea263d7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java @@ -243,7 +243,7 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign { } @Override - public ResultBean saveRetrievalApplyInfo(AppDeliveredApplyDto appDeliveredApplyDto) { + public ResultBean saveRetrievalApplyInfo(AppDeliveredApplyDto appDeliveredApplyDto) { return busDeliveredApplyService.saveRetrievalApplyInfo(appDeliveredApplyDto); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index f3a35abf6c..53d3360acc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -457,7 +457,7 @@ public class BusDeliveredApplyService extends MybatisBaseService saveRetrievalApplyInfo(AppDeliveredApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); String orgPath = dto.getOrgPath(); @@ -2152,6 +2152,7 @@ public class BusDeliveredApplyService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid); List finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid); - if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())){//是高低开 + /*if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())){//是高低开 BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto(); busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid()); busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName()); @@ -796,7 +796,7 @@ public class FinBillApplicationService extends MybatisBaseService resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -3202,6 +3203,7 @@ public class FinBillApplicationService extends MybatisBaseService销售部经理审批 List orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/")); @@ -3267,6 +3269,7 @@ public class FinBillApplicationService extends MybatisBaseService>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); @@ -3345,7 +3348,7 @@ public class FinBillApplicationService extends MybatisBaseService variables = new HashMap<>(); //查询业务信息 FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid()); - bv.setModelId(ProcDefEnum.QKLPFINBILLAPPLICATION.getProDefId()); + bv.setModelId(finBillApplication.getProcDefId()); //======================================== FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId()); @@ -3369,7 +3372,7 @@ public class FinBillApplicationService extends MybatisBaseService getRetrievalDetail(@RequestParam("sid") String sid); public ResultBean getRetrievalDetail(@RequestParam("sid") String sid); + @ApiOperation("手机端-出库开票信息 详情") + @GetMapping("/getInvoicedApply") + @ResponseBody + public ResultBean getInvoicedApply(@RequestParam("sid") String sid); + @ApiOperation("手机端-保存 出库申请") @PostMapping("/saveRetrievalApplyInfo") @ResponseBody - public ResultBean saveRetrievalApplyInfo(@RequestBody DeliveredApplyDto deliveredApplyDto); + public ResultBean saveRetrievalApplyInfo(@RequestBody DeliveredApplyDto deliveredApplyDto); + + @ApiOperation("手机端-保存 出库开票信息") + @PostMapping("/saveInvoicedApplyInfo") + @ResponseBody + public ResultBean saveInvoicedApplyInfo(@RequestBody BillApplicationIInfoDto billApplicationIInfoDto); @ApiOperation("初始化 出库申请 车架号") @GetMapping("/getRetrievalCarVin") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java index e0626175c8..5c97913fa3 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java @@ -1,6 +1,7 @@ package com.yxt.anrui.terminal.api.autoservice.retrieval; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -84,8 +85,10 @@ public class DeliveredApplyDto implements Dto { private List carList = new ArrayList<>(); @ApiModelProperty("剩余") private List discountLeave = new ArrayList<>(); - - + @ApiModelProperty("是否开票（1开票，0不开票）") + private String hasInvoiceKey; + @ApiModelProperty("是否开票（1开票，0不开票）") + private String hasInvoice; /* @ApiModelProperty("合同id") @JsonProperty("contractId") private String contractNo; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java index 8ba678662b..2b8a301b14 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.terminal.api.autoservice.retrieval; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -108,4 +109,12 @@ public class DeliveredDetailsVo implements Vo { private String busSalesOrderSid; private boolean showLoanUser; + + @ApiModelProperty("是否开票（1开票，0不开票）") + private String hasInvoiceKey; + @ApiModelProperty("是否开票（1开票，0不开票）") + private String hasInvoice; + @ApiModelProperty("开票sid") + private String invoiceSid; + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java index 0fabf9b94d..acff362454 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java @@ -25,6 +25,8 @@ *********************************************************/ package com.yxt.anrui.terminal.biz.autoservice.retrieval; +import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoDto; +import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoVo; import com.yxt.anrui.terminal.api.autoservice.retrieval.*; import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto; import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery; @@ -86,11 +88,21 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign { return appBusDeliveredApplyService.getRetrievalDetail(sid); } + @Override + public ResultBean getInvoicedApply(String sid) { + return appBusDeliveredApplyService.getInvoicedApply(sid); + } + @Override public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) { return appBusDeliveredApplyService.saveRetrievalApplyInfo(deliveredApplyDto); } + @Override + public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto billApplicationIInfoDto) { + return appBusDeliveredApplyService.saveInvoicedApplyInfo(billApplicationIInfoDto); + } + @Override public ResultBean> getRetrievalCarVin(String sid) { return appBusDeliveredApplyService.getRetrievalCarVin(sid); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java index f1463fcf18..f4b275274d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java @@ -31,15 +31,34 @@ import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo; +import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDetailsVo; +import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDto; +import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationFeign; +import com.yxt.anrui.buscenter.api.busbillfile.BusBillFileDto; +import com.yxt.anrui.buscenter.api.busbillfile.BusBillFileVo; +import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerDto; +import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerVo; +import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleDto; +import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleVo; import com.yxt.anrui.buscenter.api.busdelivered.*; import com.yxt.anrui.buscenter.api.busdeliveredapply.*; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo; +import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo; +import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto; +import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo; +import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto; +import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.terminal.api.autoservice.invoiced.*; +import com.yxt.anrui.terminal.api.autoservice.invoiced.VinListVo; import com.yxt.anrui.terminal.api.autoservice.retrieval.*; import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto; import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery; @@ -93,6 +112,10 @@ public class AppBusDeliveredApplyService { private SysStaffOrgFeign sysStaffOrgFeign; @Autowired private BaseTrailerFeign baseTrailerFeign; + @Autowired + private BusBillApplicationFeign busBillApplicationFeign; + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; public ResultBean> getRetrievalNotList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -137,10 +160,125 @@ public class AppBusDeliveredApplyService { return rb.success().setData(vo); }*/ - public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) { + public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) { AppDeliveredApplyDto dto = new AppDeliveredApplyDto(); BeanUtil.copyProperties(deliveredApplyDto, dto); - ResultBean resultBean = busDeliveredApplyFeign.saveRetrievalApplyInfo(dto); + ResultBean resultBean = busDeliveredApplyFeign.saveRetrievalApplyInfo(dto); + return resultBean; + } + + public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto billApplicationIInfoDto) { + BusBillApplicationDto busBillApplicationDto = new BusBillApplicationDto(); + BeanUtil.copyProperties(billApplicationIInfoDto, busBillApplicationDto, "carBuyContractImages"); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(billApplicationIInfoDto.getOrgPath()).getData(); + busBillApplicationDto.setUseOrgSid(useOrgSid); + busBillApplicationDto.setCreateBySid(billApplicationIInfoDto.getUserSid()); + busBillApplicationDto.setTotalBillMoney(billApplicationIInfoDto.getInvoiceTotal()); + busBillApplicationDto.setOrgSidPath(billApplicationIInfoDto.getOrgPath()); + busBillApplicationDto.setSaleTypeValue(billApplicationIInfoDto.getSaleType()); + busBillApplicationDto.setSaleDeptName(billApplicationIInfoDto.getSellerDept()); + busBillApplicationDto.setStaffName(billApplicationIInfoDto.getSellerName()); + busBillApplicationDto.setOpenTickUnitName(billApplicationIInfoDto.getInvoicingUnit()); + busBillApplicationDto.setCustomerName(billApplicationIInfoDto.getName()); + busBillApplicationDto.setOneBillMoney(billApplicationIInfoDto.getInvoiceMoney()); + busBillApplicationDto.setOpenTickTypeKey(billApplicationIInfoDto.getOpenTickTypeKey()); + busBillApplicationDto.setOpenTickTypeValue(billApplicationIInfoDto.getOpenTickTypeValue()); + busBillApplicationDto.setOpenTickSid(billApplicationIInfoDto.getOpenTickSid()); + busBillApplicationDto.setOpenTickName(billApplicationIInfoDto.getOpenTickName()); + busBillApplicationDto.setBillStateKey(billApplicationIInfoDto.getInvoiceStateKey()); + busBillApplicationDto.setBillStateValue(billApplicationIInfoDto.getInvoiceState()); + busBillApplicationDto.setContractNo(billApplicationIInfoDto.getContractId()); + busBillApplicationDto.setApplyDate(billApplicationIInfoDto.getDate()); + busBillApplicationDto.setCreateBySid(billApplicationIInfoDto.getUserSid()); + busBillApplicationDto.setNodeState(billApplicationIInfoDto.getNodeState()); + busBillApplicationDto.setBillNo(billApplicationIInfoDto.getBillNo()); + String publishInfo = billApplicationIInfoDto.getPublishInfo(); + String[] split = publishInfo.split("-"); + busBillApplicationDto.setDeptName(split[0]); + busBillApplicationDto.setCreateByName(split[1]); + //开票车辆信息 + List vinList = billApplicationIInfoDto.getVinList(); + List busBillVehicleDtos = new ArrayList<>(); + for (VinListDto vinListDto : vinList) { + if (StringUtils.isBlank(vinListDto.getInvoiceInfo())) { + return new ResultBean().fail().setMsg("开票信息不能为空"); + } + BusBillVehicleDto busBillVehicleDto = new BusBillVehicleDto(); + busBillVehicleDto.setVinNo(vinListDto.getVin()); + busBillVehicleDto.setVehSid(vinListDto.getVinSid()); + busBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey()); + busBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState()); + busBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey()); + busBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType()); + busBillVehicleDto.setOpenTickSid(vinListDto.getOpenTickSid()); + busBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName()); + busBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo()); + busBillVehicleDtos.add(busBillVehicleDto); + } + busBillApplicationDto.setBusBillVehicles(busBillVehicleDtos); + //开票挂车信息 + List finBillTrailers = billApplicationIInfoDto.getFinBillTrailers(); + List busBillTrailerDtos = new ArrayList<>(); + if (finBillTrailers != null && finBillTrailers.size() > 0) { + for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) { + BusBillTrailerDto busBillTrailerDto = new BusBillTrailerDto(); + BeanUtil.copyProperties(finBillTrailerDto, busBillTrailerDto); + busBillTrailerDtos.add(busBillTrailerDto); + } + } + busBillApplicationDto.setBusBillTrailers(busBillTrailerDtos); + //附件信息 + List appCarBuyContractImages = billApplicationIInfoDto.getCarBuyContractImages();//车辆买卖合同 + List customerInvoiceApplyImages = billApplicationIInfoDto.getCustomerInvoiceApplyImages();//客户开票申请书 + List invoiceApplyConfirmImages = billApplicationIInfoDto.getInvoiceApplyConfirmImages();//开票信息确认书 + List registerContractImages = billApplicationIInfoDto.getRegisterContractImages();//车辆登记合同 + List idCardImages = billApplicationIInfoDto.getIdCardImages();//证件 + List carBuyContractImages = new ArrayList<>(); // 车辆买卖合同 + List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 + List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 + List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 + List idCardImagesPC = new ArrayList<>();//证件 + if (appCarBuyContractImages != null) { + for (String appCarBuyContractImage : appCarBuyContractImages) { + BusBillFileDto busBillFileDto = new BusBillFileDto(); + busBillFileDto.setFileUrl(appCarBuyContractImage); + carBuyContractImages.add(busBillFileDto); + } + } + if (customerInvoiceApplyImages != null) { + for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { + BusBillFileDto busBillFileDto = new BusBillFileDto(); + busBillFileDto.setFileUrl(customerInvoiceApplyImage); + khkpsqsApplicationAppendxs.add(busBillFileDto); + } + } + if (invoiceApplyConfirmImages != null) { + for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) { + BusBillFileDto busBillFileDto = new BusBillFileDto(); + busBillFileDto.setFileUrl(invoiceApplyConfirmImage); + kpxxqrsApplicationAppendxs.add(busBillFileDto); + } + } + if (registerContractImages != null) { + for (String registerContractImage : registerContractImages) { + BusBillFileDto busBillFileDto = new BusBillFileDto(); + busBillFileDto.setFileUrl(registerContractImage); + cldjhtApplicationAppendxs.add(busBillFileDto); + } + } + if (idCardImages != null) { + for (String idCardImage : idCardImages) { + BusBillFileDto busBillFileDto = new BusBillFileDto(); + busBillFileDto.setFileUrl(idCardImage); + idCardImagesPC.add(busBillFileDto); + } + } + busBillApplicationDto.setCarBuyContractImages(carBuyContractImages); + busBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); + busBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); + busBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); + busBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC); + ResultBean resultBean = busBillApplicationFeign.save(busBillApplicationDto); return resultBean; } @@ -164,6 +302,117 @@ public class AppBusDeliveredApplyService { return rb.success().setData(vo); } + public ResultBean getInvoicedApply(String sid) { + //参数sid为出库sid + BillApplicationIInfoVo billApplicationIInfoVo = new BillApplicationIInfoVo(); + BusBillApplicationDetailsVo data = busBillApplicationFeign.fetchDetailByCkSid(sid).getData(); + if (data != null) { + billApplicationIInfoVo.setProcInsId(data.getProcInstSid()); + billApplicationIInfoVo.setInvoiceTotal(data.getTotalBillMoney()); + billApplicationIInfoVo.setOrgPath(data.getOrgSidPath()); + billApplicationIInfoVo.setSaleType(data.getSaleTypeValue()); + billApplicationIInfoVo.setSellerDept(data.getSaleDeptName()); + billApplicationIInfoVo.setSellerName(data.getStaffName()); + billApplicationIInfoVo.setInvoicingUnit(data.getOpenTickUnitName()); + billApplicationIInfoVo.setName(data.getCustomerName()); + billApplicationIInfoVo.setInvoiceMoney(data.getOneBillMoney()); + billApplicationIInfoVo.setOpenTickTypeKey(data.getOpenTickTypeKey()); + billApplicationIInfoVo.setOpenTickTypeValue(data.getOpenTickTypeValue()); + billApplicationIInfoVo.setOpenTickSid(data.getOpenTickSid()); + billApplicationIInfoVo.setOpenTickName(data.getOpenTickName()); + billApplicationIInfoVo.setInvoiceStateKey(data.getBillStateKey()); + billApplicationIInfoVo.setInvoiceState(data.getBillStateValue()); + billApplicationIInfoVo.setContractId(data.getContractNo()); + billApplicationIInfoVo.setDate(data.getApplyDate()); + billApplicationIInfoVo.setUserSid(data.getCreateBySid()); + billApplicationIInfoVo.setPublishInfo(data.getDeptName() + "-" + data.getCreateByName()); + //根据合同查询销售订单 + BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(data.getContractNo()).getData(); + billApplicationIInfoVo.setBusSalesOrderSid(busSalesOrder.getSid()); + //车辆信息 + List vinListVos = new ArrayList<>(); + List busBillVehicleVos = data.getBusBillVehicles(); + for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) { + com.yxt.anrui.terminal.api.autoservice.invoiced.VinListVo vinListVo = new VinListVo(); + vinListVo.setVin(busBillVehicleVo.getVinNo()); + vinListVo.setVinSid(busBillVehicleVo.getVehSid()); + vinListVo.setCertificateStateKey(busBillVehicleVo.getCertificateStateKey()); + vinListVo.setCertificateState(busBillVehicleVo.getCertificateStateValue()); + vinListVo.setInvoiceTypeKey(busBillVehicleVo.getBillTypeKey()); + vinListVo.setInvoiceType(busBillVehicleVo.getBillTypeValue()); + vinListVo.setOpenTickSid(busBillVehicleVo.getOpenTickSid()); + vinListVo.setInvoiceName(busBillVehicleVo.getOpenTickName()); + vinListVo.setInvoiceInfo(busBillVehicleVo.getOpenTickRemarks()); + vinListVo.setZcHgzImages(busBillVehicleVo.getCertificatePhoto()); + vinListVos.add(vinListVo); + } + billApplicationIInfoVo.setVinList(vinListVos); + //挂车信息 + List busBillTrailers = data.getBusBillTrailers(); + List finBillTrailerVos = new ArrayList<>(); + if (busBillTrailers != null && busBillTrailers.size() > 0) { + for (BusBillTrailerVo busBillTrailerVo : busBillTrailers) { + FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); + BeanUtil.copyProperties(busBillTrailerVo, finBillTrailerVo); + List hgzImageUrl = busBillTrailerVo.getHgzImageUrl(); + finBillTrailerVo.setFiles(hgzImageUrl); + finBillTrailerVo.setOneBillMoney(busBillTrailerVo.getOneBillMoney()); + finBillTrailerVos.add(finBillTrailerVo); + } + } + billApplicationIInfoVo.setFinBillTrailers(finBillTrailerVos); + //附件信息 + List carBuyContractImages = data.getCarBuyContractImages(); + List khkpsqsApplicationAppendxs = data.getKhkpsqsApplicationAppendxs(); + List kpxxqrsApplicationAppendxs = data.getKpxxqrsApplicationAppendxs(); + List cldjhtApplicationAppendxs = data.getCldjhtApplicationAppendxs(); + List zjApplicationAppendxs = data.getZjApplicationAppendxs(); + List appCarBuyContractImages = new ArrayList<>();//客户开票申请书 + List customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书 + List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 + List registerContractImages = new ArrayList<>();//车辆登记合同 + List idCardImages = new ArrayList<>(); + if (carBuyContractImages.size() > 0) { + for (BusBillFileVo carBuyContractImage : carBuyContractImages) { + appCarBuyContractImages.add(carBuyContractImage.getFileUrl()); + } + } + if (zjApplicationAppendxs.size() > 0) { + for (BusBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { + idCardImages.add(zjApplicationAppendx.getFileUrl()); + } + } + if (khkpsqsApplicationAppendxs.size() > 0) { + for (BusBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { + customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); + } + } + if (kpxxqrsApplicationAppendxs.size() > 0) { + for (BusBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { + invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); + } + } + if (cldjhtApplicationAppendxs.size() > 0) { + for (BusBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { + registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); + } + } + billApplicationIInfoVo.setCarBuyContractImages(appCarBuyContractImages); + billApplicationIInfoVo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages); + billApplicationIInfoVo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages); + billApplicationIInfoVo.setRegisterContractImages(registerContractImages); + billApplicationIInfoVo.setIdCardImages(idCardImages); + BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(data.getContractNo()).getData(); + if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { + billApplicationIInfoVo.setIsCanEdit(false); + billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); + } else { + billApplicationIInfoVo.setIsCanEdit(true); + } + } + return null; + } + public ResultBean deleteRetrievalInfo(String sid) { ResultBean rb = ResultBean.fireFail(); String[] sids = {sid}; @@ -429,7 +678,7 @@ public class AppBusDeliveredApplyService { String topPrice = baseVehinstallmodelDetailsVo.getTopPrice(); configVoList.add(getConfigValueSpanSize("成交价", topPrice, 2)); String installNameKey = baseVehinstallmodelDetailsVo.getInstallNameKey(); - if("08".equals(installNameKey)){ + if ("08".equals(installNameKey)) { //车辆功能 String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue(); configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1)); @@ -443,7 +692,7 @@ public class AppBusDeliveredApplyService { configVoList.add(getConfigValueSpanSize("供应商", baseVehinstallmodelDetailsVo.getRefitFactory(), 1)); configVoList.add(getConfigValueSpanSize("冷机品牌", baseVehinstallmodelDetailsVo.getCoolerBrand(), 1)); configVoList.add(getConfigValueSpanSize("冷机型号", baseVehinstallmodelDetailsVo.getCoolerModel(), 1)); - }else{ + } else { //车辆功能 String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue(); configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1));