From 84e9f5e227274067a6d932f91a7520d974ddbe60 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 18 Oct 2023 18:57:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BillApplicationIInfoVoss.java | 97 +++++++++++++++++++ .../FinBillApplicationFeign.java | 5 + .../FinBillApplicationFeignFallback.java | 5 + .../api/finbillapplication/VinListVos.java | 37 +++++++ .../FinBillApplicationMapper.java | 8 ++ .../FinBillApplicationMapper.xml | 45 +++++++++ .../FinBillApplicationRest.java | 5 + .../FinBillApplicationService.java | 43 ++++++++ .../FinCompanyInvoicingService.java | 2 - .../BillApplicationPageInfoQuery.java | 8 ++ .../autoservice/invoiced/InvoicedService.java | 11 +++ 11 files changed, 264 insertions(+), 2 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java new file mode 100644 index 0000000000..89aeaafcf8 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java @@ -0,0 +1,97 @@ +package com.yxt.anrui.fin.api.finbillapplication; + +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/10/18 + **/ +@Data +public class BillApplicationIInfoVoss { + + @ApiModelProperty("业务sid") + private String sid; + @ApiModelProperty("出库sid") + private String ckSid; + @ApiModelProperty(value = "销售类型value") + private String saleType; + @ApiModelProperty("部门-人员名") + private String publishInfo; + @ApiModelProperty(value = "销售部门名称") + private String sellerDept; + @ApiModelProperty(value = "销售专员名称") + private String sellerName; + @ApiModelProperty("申请日期") + private String date; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty(value = "开票单位名称") + private String invoicingUnit; + @ApiModelProperty(value = "开票类型key") + private String openTickTypeKey; + @ApiModelProperty(value = "开票类型value") + private String openTickTypeValue; + @ApiModelProperty(value = "开票名称sid") + private String openTickSid; + @ApiModelProperty(value = "开票名称") + private String openTickName; + @ApiModelProperty("单台开票价") + private String invoiceMoney; + @ApiModelProperty("车辆集合") + private List vinList; + @ApiModelProperty("开票总价") + private String invoiceTotal; + @ApiModelProperty("开票状态") + private String invoiceState; + @ApiModelProperty("开票状态") + private String invoiceStateKey; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("开票挂车信息") + private List finBillTrailers; + @ApiModelProperty("证件") + private List idCardImages; + @ApiModelProperty("车辆买卖合同") + private List carBuyContractImages; + @ApiModelProperty("客户开票申请书") + private List customerInvoiceApplyImages; + @ApiModelProperty("车辆登记合同") + private List registerContractImages; + @ApiModelProperty("确认书") + private List invoiceApplyConfirmImages; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("合同sid") + private String contractSid; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("是否可以编辑开票价") + private Boolean isCanEdit; + + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("流程实列id") + private String procInsId; + @ApiModelProperty("流程状态") + private String nodeState; + + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("销售订单sid") + private String busSalesOrderSid; + @ApiModelProperty("是否显示价值客户") + private Boolean showValueCustomer; + @ApiModelProperty("是否为单独新增") + private Boolean showBtn; +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java index cb41eb0bdb..3b2ea5e051 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java @@ -264,4 +264,9 @@ public interface FinBillApplicationFeign { @PostMapping("/appQKFetchDetailsBySid") @ResponseBody public ResultBean appQKFetchDetailsBySid(@RequestBody AppBillApplicationDetailsQKQuery query); + + @ApiOperation("移动端开票新增初始化") + @GetMapping("/selectByContractNo") + @ResponseBody + ResultBean selectByContractNo(@RequestParam("contractId") String contractId, @RequestParam("vins") List vins); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java index 8dfe14c2e4..83f87a6138 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java @@ -276,4 +276,9 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign public ResultBean appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) { return null; } + + @Override + public ResultBean selectByContractNo(String contractId, List vins) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java new file mode 100644 index 0000000000..eef464abc1 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.fin.api.finbillapplication; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/10/18 + **/ +@Data +public class VinListVos { + + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("车辆sid") + private String vinSid; + @ApiModelProperty("开票类型") + private String invoiceTypeKey; + @ApiModelProperty("开票类型") + private String invoiceType; + @ApiModelProperty(value = "开票名称sid") + private String openTickSid; + @ApiModelProperty("开票名称") + private String invoiceName; + @ApiModelProperty("开票信息") + private String invoiceInfo; // 开票信息 + @ApiModelProperty("合格证状态key") + private String certificateStateKey; // 合格证状态key + @ApiModelProperty("合格证状态value") + private String certificateState; // 合格证状态value + @ApiModelProperty("主车合格证照片") + private List zcHgzImages = new ArrayList<>(); +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java index cd0887b1b8..06fb2e3057 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java @@ -30,6 +30,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.fin.api.finbillapplication.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -87,4 +89,10 @@ public interface FinBillApplicationMapper extends BaseMapper void updateZZ(String businessSid); List getSelectBySid(String businessSid); + + BusSalesOrder selectNo(String contractId); + + BillApplicationIInfoVoss selectByContractNos(String contractId); + + VinListVos selectByBus(@Param("contractNo") String contractId,@Param("vinSid") String s); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml index 2f13f72812..4312f6a33b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml @@ -143,4 +143,49 @@ where billNo = #{qkkpBillNo} ORDER BY createTime DESC LIMIT 1 + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java index 047b94b9a7..bc512b002d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java @@ -335,4 +335,9 @@ public class FinBillApplicationRest implements FinBillApplicationFeign { public ResultBean appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) { return finBillApplicationService.appQKFetchDetailsBySid(query); } + + @Override + public ResultBean selectByContractNo(String contractId, List vins) { + return finBillApplicationService.selectByContractNo(contractId,vins); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index c1825eed7b..058e1617df 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -4453,4 +4453,47 @@ public class FinBillApplicationService extends MybatisBaseService selectByContractNo(String contractId, List vins) { + ResultBean rb = ResultBean.fireFail(); + BillApplicationIInfoVoss billApplicationIInfoVoss = new BillApplicationIInfoVoss(); + BusSalesOrder busSalesOrder = baseMapper.selectNo(contractId); + ResultBean resultBean = busSalesOrderFeign.fetchDetailsBySid(busSalesOrder.getSid()); + BusSalesOrderDetailsVo busSalesOrderDetailsVo = resultBean.getData(); + billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId); + //开票单位 + if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + billApplicationIInfoVoss.setInvoicingUnit(invoicingDetailsVoResultBean.getData().getName()); + } + } + List vinListVos = new ArrayList<>(); + List pcSelBillGcVos = new ArrayList<>(); + for (int i = 0; i < vins.size(); i++) { + VinListVos vinListVos1 = new VinListVos(); + vinListVos1 = baseMapper.selectByBus(contractId,vins.get(i)); + //主车合格证照片 + BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vins.get(i)).getData(); + if (baseVehicleCertificateVo != null) { + List clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); + vinListVos1.setZcHgzImages(clhgeImages); + } + //挂车信息 + TraliveredVo data = baseTrailerFeign.trailerList(vins.get(i), contractId).getData(); + List list = data.getList(); + if (list != null && list.size() > 0) { + for (TrailerVo trailerVo : list) { + FinBillTrailerVo pcSelBillGcVo = new FinBillTrailerVo(); + pcSelBillGcVo.setGcVinNo(trailerVo.getTrailerVinNo()); + pcSelBillGcVo.setVinNo(data.getVinNo()); + pcSelBillGcVos.add(pcSelBillGcVo); + } + } + vinListVos.add(vinListVos1); + } + billApplicationIInfoVoss.setVinList(vinListVos); + billApplicationIInfoVoss.setFinBillTrailers(pcSelBillGcVos); + return rb.success().setData(billApplicationIInfoVoss); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index 41463f199d..7cba9a923f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java @@ -517,8 +517,6 @@ public class FinCompanyInvoicingService extends MybatisBaseService vins = new ArrayList<>(); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 0c26cc40e3..0c9dad8cb2 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -20,7 +20,9 @@ import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDet 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.buscenter.api.bussalesorder.BusSalesOrdersVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; import com.yxt.anrui.fin.api.finbillapplication.*; import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto; import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery; @@ -186,6 +188,15 @@ public class InvoicedService { if (StringUtils.isBlank(query.getSid())) { String userSid = query.getUserSid(); String orgPath = query.getOrgPath(); + List vins = query.getVins(); + if(vins.size() == 0){ + return rb.setMsg("请选择车辆"); + } + ResultBean billApplicationIInfoVoResultBean = finBillApplicationFeign.selectByContractNo(query.getContractId(),vins); + if(billApplicationIInfoVoResultBean.getData() != null){ + BillApplicationIInfoVoss billApplicationIInfoVoss = billApplicationIInfoVoResultBean.getData(); + BeanUtil.copyProperties(billApplicationIInfoVoss,vo); + } SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData(); vo.setPublishInfo(sysOrganizationVo.getName() + "-" + sysUserVo.getName()); From 2473ed0fc09ef600149b51c6d36b31bb9a3e8305 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 18 Oct 2023 19:01:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/finbillapplication/FinBillApplicationFeignFallback.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java index 83f87a6138..bc57e54ebe 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java @@ -278,7 +278,7 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign } @Override - public ResultBean selectByContractNo(String contractId, List vins) { + public ResultBean selectByContractNo(String contractId, List vins) { return null; } } \ No newline at end of file From 51d6897bf66543b84dd401eed2008d0daa9944ae Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 18 Oct 2023 19:15:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/finbillapplication/FinBillApplicationMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml index 4312f6a33b..d5736b319b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.xml @@ -163,7 +163,7 @@ bo.`purchaseSystemSid`, bm.`modelName`, bm.`modelSid`, - bo.`oneBillMoney` AS kpMoney + if(bo.payTypeKey =1,bo.`oneBillMoney`,(select mainVehicleAmount from anrui_riskcenter.loan_solutions where salesOrderSid = bo.sid)) AS kpMoney FROM anrui_buscenter.`bus_sales_order` bo JOIN anrui_buscenter.`bus_sales_order_model` bm ON bo.`sid` = bm.`salesOrderSid` From 5982ef84c1564022dbc18c2f27630196900dd560 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 18 Oct 2023 19:16:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terminal/biz/autoservice/invoiced/InvoicedService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 0c9dad8cb2..0de473eb35 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -189,9 +189,10 @@ public class InvoicedService { String userSid = query.getUserSid(); String orgPath = query.getOrgPath(); List vins = query.getVins(); - if(vins.size() == 0){ + /*if(vins.size() == 0){ return rb.setMsg("请选择车辆"); - } + }*/ + vins.add("84c5dfbd-935b-45a2-a7da-7aa3ff30e408"); ResultBean billApplicationIInfoVoResultBean = finBillApplicationFeign.selectByContractNo(query.getContractId(),vins); if(billApplicationIInfoVoResultBean.getData() != null){ BillApplicationIInfoVoss billApplicationIInfoVoss = billApplicationIInfoVoResultBean.getData(); From 2a06345e017b31826ec9242d3ca8662dbcdbc62a Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 19 Oct 2023 08:41:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/finbillapplication/FinBillApplicationService.java | 5 +++++ .../biz/autoservice/invoiced/InvoicedService.java | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 058e1617df..4888a8d85d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -4461,6 +4461,11 @@ public class FinBillApplicationService extends MybatisBaseService resultBean = busSalesOrderFeign.fetchDetailsBySid(busSalesOrder.getSid()); BusSalesOrderDetailsVo busSalesOrderDetailsVo = resultBean.getData(); billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId); + if("1".equals(busSalesOrder.getPayTypeKey())){ + billApplicationIInfoVoss.setIsCanEdit(true); + }else{ + billApplicationIInfoVoss.setIsCanEdit(false); + } //开票单位 if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 0de473eb35..572866581f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -189,10 +189,9 @@ public class InvoicedService { String userSid = query.getUserSid(); String orgPath = query.getOrgPath(); List vins = query.getVins(); - /*if(vins.size() == 0){ + if(vins.size() == 0){ return rb.setMsg("请选择车辆"); - }*/ - vins.add("84c5dfbd-935b-45a2-a7da-7aa3ff30e408"); + } ResultBean billApplicationIInfoVoResultBean = finBillApplicationFeign.selectByContractNo(query.getContractId(),vins); if(billApplicationIInfoVoResultBean.getData() != null){ BillApplicationIInfoVoss billApplicationIInfoVoss = billApplicationIInfoVoResultBean.getData(); @@ -231,6 +230,9 @@ public class InvoicedService { vo.setContractId(finBillApplicationDetailsVo.getContractNo()); vo.setDate(finBillApplicationDetailsVo.getApplyDate()); vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid()); + if("1".equals(finBillApplicationDetailsVo.getShowBtnStr())){ + vo.setShowBtn(true); + } vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName()); //根据合同查询销售订单 BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();