diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java index a1e271bbb6..b19d8a1ca5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java @@ -143,4 +143,8 @@ public interface BaseDistributorFeign { @ApiOperation("查询所有经销商信息") @GetMapping("/selectAllDisList") ResultBean> selectAllDisList(); + + @ApiOperation("根据sid查询所有经销商信息") + @GetMapping("/selectDisListBySid/{sid}") + ResultBean selectDisListBySid(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java index 91925be000..9757721c5b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java @@ -157,5 +157,10 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign { return null; } + @Override + public ResultBean selectDisListBySid(String sid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java index 6b27111c23..c0347b02a7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java @@ -133,4 +133,5 @@ public interface BaseDistributorMapper extends BaseMapper { List selectAllDisList(); + BaseDistributorListVo selectDisListBySid(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml index a388424619..ad4dc03788 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml @@ -234,4 +234,16 @@ FROM base_distributor WHERE isDelete = 0 + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java index 027fd39158..8c64bc8926 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java @@ -266,4 +266,9 @@ public class BaseDistributorRest implements BaseDistributorFeign { public ResultBean> selectAllDisList() { return baseDistributorService.selectAllDisList(); } + + @Override + public ResultBean selectDisListBySid(String sid) { + return baseDistributorService.selectDisListBySid(sid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 5217f5c893..ff163baa5b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -876,4 +876,10 @@ public class BaseDistributorService extends MybatisBaseService selectDisListBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseDistributorListVo baseDistributorListVo = baseMapper.selectDisListBySid(sid); + return rb.success().setData(baseDistributorListVo); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationDetailsQKQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationDetailsQKQuery.java new file mode 100644 index 0000000000..2b8d9dbe85 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationDetailsQKQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.fin.api.finbillapplication; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppBillApplicationDetailsQKQuery implements Query { + private static final long serialVersionUID = -4420699298916976735L; + + @ApiModelProperty("申请sid") + private String sid; + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; +} 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 f40c7ca4e7..f131f71c2b 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 @@ -186,4 +186,9 @@ public interface FinBillApplicationFeign { @ResponseBody public ResultBean addInvoicedApply(@Valid @RequestBody AddInvoicedApplyDto dto); + @ApiOperation("移动端欠款开票初始化") + @PostMapping("/appQKFetchDetailsBySid") + @ResponseBody + public ResultBean appQKFetchDetailsBySid(@RequestBody AppBillApplicationDetailsQKQuery query); + } \ 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 3d6ef88416..9fec290f6d 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 @@ -191,4 +191,9 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign public ResultBean addInvoicedApply(AddInvoicedApplyDto dto) { return null; } + + @Override + public ResultBean appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) { + return null; + } } \ 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 a7280ea810..69bd140ca6 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 @@ -229,4 +229,9 @@ public class FinBillApplicationRest implements FinBillApplicationFeign { public ResultBean addInvoicedApply(AddInvoicedApplyDto dto) { return finBillApplicationService.addInvoicedApply(dto); } + + @Override + public ResultBean appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) { + return finBillApplicationService.appQKFetchDetailsBySid(query); + } } 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 960d3df929..bf1ff21c6e 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 @@ -26,9 +26,12 @@ package com.yxt.anrui.fin.biz.finbillapplication; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basedistributor.BaseDistributorFeign; +import com.yxt.anrui.base.api.basedistributor.BaseDistributorListVo; import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase; import com.yxt.anrui.base.api.baseinternalpurchase.flow.GetNodeVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; @@ -38,6 +41,7 @@ import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.commonappendix.*; +import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; import com.yxt.anrui.base.common.enums.BillTypeEnum; @@ -46,6 +50,7 @@ import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.anrui.fin.api.finbillapplication.*; @@ -146,6 +151,8 @@ public class FinBillApplicationService extends MybatisBaseService createQueryWrapper(FinBillApplicationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -233,6 +240,7 @@ public class FinBillApplicationService extends MybatisBaseService listPageQK(PagerQuery pq) { FinBillApplicationQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); + 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()); @@ -2027,4 +2052,36 @@ public class FinBillApplicationService extends MybatisBaseService appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) { + ResultBean rb = ResultBean.fireFail(); + String sid = query.getSid(); + String userSid = query.getUserSid(); + String contractNo = query.getContractNo(); + String orgPath = query.getOrgPath(); + FinBillApplicationDetailsVo finBillApplicationDetailsVo = new FinBillApplicationDetailsVo(); + if (StringUtils.isBlank(sid)){ + finBillApplicationDetailsVo.setCreateBySid(userSid); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); + finBillApplicationDetailsVo.setCreateByName(sysUserVo.getName()); + finBillApplicationDetailsVo.setDeptSid(sysUserVo.getDepartmentSid()); + finBillApplicationDetailsVo.setDeptName(sysUserVo.getDepartmentName()); + finBillApplicationDetailsVo.setApplyDate(DateUtil.formatDate(new Date())); + finBillApplicationDetailsVo.setStaffSid(sysUserVo.getStaffSid()); + finBillApplicationDetailsVo.setStaffName(sysUserVo.getName()); + finBillApplicationDetailsVo.setSaleDeptSid(sysUserVo.getDepartmentSid()); + finBillApplicationDetailsVo.setSaleDeptName(sysUserVo.getDepartmentName()); + BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); + finBillApplicationDetailsVo.setSaleTypeKey(busSalesOrder.getPayTypeKey()); + finBillApplicationDetailsVo.setSaleTypeValue(busSalesOrder.getPayType()); + finBillApplicationDetailsVo.setContractNo(contractNo); + CommonContract commonContract = commonContractFeign.selectByNo(contractNo).getData(); + finBillApplicationDetailsVo.setOpenTickUnitName(commonContract.getPartyA()); + finBillApplicationDetailsVo.setCustomerSid(commonContract.getCustomerSid()); + finBillApplicationDetailsVo.setCustomerName(commonContract.getPartyB()); + }else { + finBillApplicationDetailsVo = fetchDetailsVoBySid(sid); + } + return rb.success().setData(finBillApplicationDetailsVo); + } } \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 40807f3607..aa01a8c144 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -21,7 +21,7 @@ public enum ProcDefEnum { BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"), FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"), FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"), - RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"), + RECORDAPPLICATION("入库申请", "process_xbwq2c7p:4:1232504"), SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"), SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"), SALESORDER("销售订单审批流程", "process_p5ils2rn:9:1167504"), diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java index d5f25bcdf3..a9a47a5535 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java @@ -1,60 +1,82 @@ package com.yxt.anrui.terminal.api.autoservice.advanceInvoice; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data public class AdvanceInvoiceDto implements Dto { private static final long serialVersionUID = 3374676388152082886L; + @ApiModelProperty("欠款开票sid") + private String sid; + @ApiModelProperty("是否可以编辑开票价") + private boolean isCanEdit; + @ApiModelProperty("销售类型") + private String saleType; + @ApiModelProperty("部门-人员名") + private String publishInfo; + @ApiModelProperty("销售部门") + private String sellerDept; + @ApiModelProperty("销售人员") + private String sellerName; + @ApiModelProperty("发起日期") + private String date; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty("开票单位") + private String invoicingUnit; + @ApiModelProperty("是否领取原件") + private String getOriginalValue; + @ApiModelProperty("默认开票名称") + private String openTickName; + @ApiModelProperty("单台开票价") + private String invoiceMoney; + @ApiModelProperty("选择车辆列表") + private List vinList = new ArrayList<>(); + @ApiModelProperty("欠款总金额") + private String invoiceTotal; + @ApiModelProperty("回款日期") + private String collectionDate; + @ApiModelProperty("欠款原因key") + private String reasonKey; + @ApiModelProperty("欠款原因value") + private String reasonValue; + @ApiModelProperty("原因备注") + private String remarks; + @ApiModelProperty("欠款开票挂车信息") + private List finBillTrailers; + @ApiModelProperty("证件") + private List idCardImages; + @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("合同id") - @JsonProperty("contractId") - private String contractNo; - @ApiModelProperty("客户") - private String customerName; - @ApiModelProperty("申请日期") - private String applyDate; - @ApiModelProperty("车辆列表") - private List carList; - @ApiModelProperty("欠款金额") - @JsonProperty("cumulativeArrearsPrice") - private String arrearsMoney; - @ApiModelProperty("车型") - @JsonProperty("modelName") - private String carModel; - @ApiModelProperty("开票信息确认书") - private List confirmFile; - @ApiModelProperty("客户开票申请书") - private List applyFile; - @ApiModelProperty("备注") - private String remarks; - @ApiModelProperty("手写原因") - @JsonProperty("reasonWrite") - private String otherReasons; - @ApiModelProperty("承诺回款日期") - @JsonProperty("collectionDate") - private String returnedMoneyDate; - @ApiModelProperty("车辆登记合同") - private List registerFile; - @ApiModelProperty("提前开票原因 0手写 1选择") - @JsonProperty("reasonType") - private String advGinReasonType; - @ApiModelProperty("提前开票原因 0手写 1选择") - @JsonProperty("reasonChoose") - private String advGinReasonValue; - @ApiModelProperty("提前开票原因 0手写 1选择") - @JsonProperty("reasonKey") - private String advGinReasonKey; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 @ApiModelProperty("任务id") private String taskId; @ApiModelProperty("流程实列id") private String procInsId; + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型名称") + private String modelName; // 车型名称 } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoQuery.java index 270b68e9f0..04f1e200d3 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoQuery.java @@ -9,6 +9,11 @@ public class AdvanceInvoiceInfoQuery implements Query { private static final long serialVersionUID = 8149076217652242268L; @ApiModelProperty("申请sid") - private String contractSid; - + private String sid; + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java index c78e8630a6..8b494af876 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.terminal.api.autoservice.advanceInvoice; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,54 +14,70 @@ import java.util.List; public class AdvanceInvoiceInfoVo implements Vo { private static final long serialVersionUID = 6256861573673134007L; + @ApiModelProperty("欠款开票sid") + private String sid; + @ApiModelProperty("是否可以编辑开票价") + private boolean isCanEdit; + @ApiModelProperty("销售类型") + private String saleType; + @ApiModelProperty("部门-人员名") + private String publishInfo; + @ApiModelProperty("销售部门") + private String sellerDept; + @ApiModelProperty("销售人员") + private String sellerName; + @ApiModelProperty("发起日期") + private String date; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty("开票单位") + private String invoicingUnit; + @ApiModelProperty("是否领取原件") + private String getOriginalValue; + @ApiModelProperty("默认开票名称") + private String openTickName; + @ApiModelProperty("单台开票价") + private String invoiceMoney; + @ApiModelProperty("选择车辆列表") + private List vinList = new ArrayList<>(); + @ApiModelProperty("欠款总金额") + private String invoiceTotal; + @ApiModelProperty("回款日期") + private String collectionDate; + @ApiModelProperty("欠款原因key") + private String reasonKey; + @ApiModelProperty("欠款原因value") + private String reasonValue; + @ApiModelProperty("原因备注") + private String remarks; + @ApiModelProperty("欠款开票挂车信息") + private List finBillTrailers; + @ApiModelProperty("证件") + private List idCardImages; + @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("合同id") - @JsonProperty("contractId") - private String contractNo; - @ApiModelProperty("客户") - private String customerName; - @ApiModelProperty("申请日期") - private String applyDate; - @ApiModelProperty("选择车辆列表") - private List carList = new ArrayList<>(); - @ApiModelProperty("所有车辆列表") - private List vinList = new ArrayList<>(); - @ApiModelProperty("欠款金额") - @JsonProperty("cumulativeArrearsPrice") - private BigDecimal arrearsMoney; - @ApiModelProperty("车型") - @JsonProperty("modelName") - private String carModel; - @ApiModelProperty("开票信息确认书") - private List confirmFile = new ArrayList<>(); - @ApiModelProperty("客户开票申请书") - private List applyFile = new ArrayList<>(); - @ApiModelProperty("备注") - private String remarks; - @ApiModelProperty("手写原因") - @JsonProperty("reasonWrite") - private String otherReasons; - @ApiModelProperty("承诺回款日期") - @JsonProperty("collectionDate") - private String returnedMoneyDate; - @ApiModelProperty("车辆登记合同") - private List registerFile = new ArrayList<>(); - @ApiModelProperty("提前开票原因 0手写 1选择") - @JsonProperty("reasonType") - private String advGinReasonType; - @ApiModelProperty("提前开票原因 0手写 1选择") - @JsonProperty("reasonChoose") - private String advGinReasonValue; - @ApiModelProperty("提前开票原因 0手写 1选择") - @JsonProperty("reasonKey") - private String advGinReasonKey; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 @ApiModelProperty("任务id") private String taskId; @ApiModelProperty("流程实列id") - @JsonProperty("procInsId") - private String procInstId; - + private String procInsId; + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型名称") + private String modelName; // 车型名称 } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageQuery.java index 984849161a..30fe968d38 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageQuery.java @@ -14,6 +14,6 @@ public class AdvanceInvoicePageQuery implements Query { @ApiModelProperty("客户名称字段 合同编号字段") private String name; - @ApiModelProperty("状态") - private String type; + @ApiModelProperty("组织全路径") + private String orgPath; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java index 6644f57c21..c483c3ccc7 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoicePageVo.java @@ -10,40 +10,23 @@ public class AdvanceInvoicePageVo implements Vo { private static final long serialVersionUID = -8631337422991366458L; @ApiModelProperty("sid") - @JsonProperty("contractSid") private String sid; @ApiModelProperty("合同状态") - @JsonProperty("contractType") - private String nodeState; + private String contractType; @ApiModelProperty("合同编号") - @JsonProperty("contractId") - private String contractNo; + private String contractId; @ApiModelProperty("欠款金额") private String arrearsMoney; @ApiModelProperty("承诺汇款日期") - @JsonProperty("paymentDate") - private String returnedMoneyDate; + private String paymentDate; @ApiModelProperty("申请人") - @JsonProperty("applicant") - private String applyName; + private String applicant; @ApiModelProperty("数量") - @JsonProperty("number") - private String num; + private String number; @ApiModelProperty("原因") private String reason; - - @ApiModelProperty("选择 手写 key 0 1") - private String advGinReasonType; - @ApiModelProperty("选择value") - private String advGinReasonValue; - @ApiModelProperty("选择key") - private String advGinReasonKey; - @ApiModelProperty("手写") - private String otherReasons; - @ApiModelProperty("创建日期") - @JsonProperty("date") - private String applyDate; + private String date; @ApiModelProperty("客户名称") private String customerName; @ApiModelProperty("是否显示办理按钮") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java index edc1e9f57d..f47ef75b5a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java @@ -44,7 +44,7 @@ import javax.validation.Valid; * Project: anrui_buscenter(销售业务)
* File: BusAdvanceGinvoiceapplyFeign.java
* Class: com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapplyFeign
- * Description: 提前开票申请.
+ * Description: 欠款开票申请.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
* Makedate: 2022-03-17 16:02:10
@@ -53,7 +53,7 @@ import javax.validation.Valid; * @version 1.0 * @since 1.0 */ -@Api(tags = "提前开票申请") +@Api(tags = "欠款开票申请") @FeignClient( contextId = "anrui-terminal-BusAdvanceGinvoiceapply", name = "anrui-terminal", @@ -62,27 +62,27 @@ import javax.validation.Valid; public interface AppBusAdvanceGinvoiceapplyFeign { - @ApiOperation("手机端-获取提前开票列表") + @ApiOperation("手机端-获取欠款开票列表") @PostMapping("/getAdvanceInvoiceList") @ResponseBody ResultBean> getAdvanceInvoiceList(@RequestBody PagerQuery pagerQuery); - @ApiOperation("移动端-新增提前开票申请") + @ApiOperation("移动端-新增欠款开票申请") @PostMapping("/addAdvanceInvoice") @ResponseBody public ResultBean addAdvanceInvoice(@Valid @RequestBody AdvanceInvoiceVinDto dto); - @ApiOperation("手机端-初始化提前开票申请") + @ApiOperation("手机端-初始化欠款开票申请") @GetMapping("/initAdvanceInvoice") @ResponseBody public ResultBean initAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query); - @ApiOperation("移动端-保存提前开票申请") + @ApiOperation("移动端-保存欠款开票申请") @PostMapping("/saveAdvanceInvoice") @ResponseBody public ResultBean saveAdvanceInvoice(@Valid @RequestBody AdvanceInvoiceDto dto); - @ApiOperation("手机端-删除提前开票") + @ApiOperation("手机端-删除欠款开票") @DeleteMapping("/deleteAdvanceInvoice") @ResponseBody public ResultBean deleteAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListDto.java index 3d272d3f8d..f6d21623b2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListDto.java @@ -10,6 +10,16 @@ public class AppCarListDto implements Dto { @ApiModelProperty("车架号") private String vin; - @ApiModelProperty("成交价") - private String price; + @ApiModelProperty("开票类型key") + private String invoiceTypeKey; + @ApiModelProperty("开票类型value") + private String invoiceType; + @ApiModelProperty("开票名称") + private String invoiceName; + @ApiModelProperty("开票信息") + private String invoiceInfo; + @ApiModelProperty("合格证状态key") + private String certificateStateKey; + @ApiModelProperty("合格证状态value") + private String certificateState; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListVo.java index e0339dfcaa..40258e2789 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListVo.java @@ -10,6 +10,17 @@ public class AppCarListVo implements Vo { @ApiModelProperty("车架号") private String vin; - @ApiModelProperty("成交价") - private String price; + @ApiModelProperty("开票类型key") + private String invoiceTypeKey; + @ApiModelProperty("开票类型value") + private String invoiceType; + @ApiModelProperty("开票名称") + private String invoiceName; + @ApiModelProperty("开票信息") + private String invoiceInfo; + @ApiModelProperty("合格证状态key") + private String certificateStateKey; + @ApiModelProperty("合格证状态value") + private String certificateState; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/FinBillTrailerDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/FinBillTrailerDto.java new file mode 100644 index 0000000000..436caa8d49 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/FinBillTrailerDto.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.autoservice.advanceInvoice; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-fin(开票挂车信息)
+ * File: FinBillTrailerDto.java
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto
+ * Description: 开票挂车信息表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "开票挂车信息表 数据传输对象", description = "开票挂车信息表 数据传输对象") +public class FinBillTrailerDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + @ApiModelProperty("主车车架号") + private String vinNo; // 主车车架号 + @ApiModelProperty("挂车车架号") + private String gcVinNo; // 挂车车架号 + @ApiModelProperty("开票类型key") + private String billTypeKey; // 开票类型key + @ApiModelProperty("开票类型value") + private String billTypeValue; // 开票类型value + @ApiModelProperty("开票名称sid") + private String openTickSid; // 开票名称sid + @ApiModelProperty("开票名称") + private String openTickName; // 开票名称 + @ApiModelProperty("开票申请单sid") + private String billAppSid; // 开票申请单sid + @ApiModelProperty("单台开票金额") + private String oneBillMoney; // 单台开票金额 + @ApiModelProperty("合格证图片") + private List files; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/FinBillTrailerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/FinBillTrailerVo.java new file mode 100644 index 0000000000..d1c3bee32c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/FinBillTrailerVo.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.autoservice.advanceInvoice; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-fin(开票挂车信息)
+ * File: FinBillTrailerVo.java
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo
+ * Description: 开票挂车信息表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-04-06 16:41:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "开票挂车信息表 视图数据对象", description = "开票挂车信息表 视图数据对象") +public class FinBillTrailerVo implements Vo { + + @ApiModelProperty("主车车架号") + private String vinNo; // 主车车架号 + @ApiModelProperty("挂车车架号") + private String gcVinNo; // 挂车车架号 + @ApiModelProperty("开票类型key") + private String billTypeKey; // 开票类型key + @ApiModelProperty("开票类型value") + private String billTypeValue; // 开票类型value + @ApiModelProperty("开票名称") + private String openTickName; // 开票名称 + @ApiModelProperty("开票申请单sid") + private String billAppSid; // 开票申请单sid + @ApiModelProperty("单台开票金额") + private String oneBillMoney; // 单台开票金额 + @ApiModelProperty("合格证图片") + private List files; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java index 3ff30b2ce5..495054a619 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java @@ -31,6 +31,8 @@ public class BillApplicationIInfoDto implements Dto { private String openTickTypeKey; @ApiModelProperty(value = "开票类型value") private String openTickTypeValue; + @ApiModelProperty(value = "开票名称sid") + private String openTickSid; @ApiModelProperty(value = "开票名称") private String openTickName; @ApiModelProperty("单台开票价") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java index f8f5f9f2d4..05bcf2dc4c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java @@ -31,6 +31,8 @@ public class BillApplicationIInfoVo implements Vo { private String openTickTypeKey; @ApiModelProperty(value = "开票类型value") private String openTickTypeValue; + @ApiModelProperty(value = "开票名称sid") + private String openTickSid; @ApiModelProperty(value = "开票名称") private String openTickName; @ApiModelProperty("单台开票价") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java index 74bde6e29e..6c487aa5cf 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java @@ -58,6 +58,8 @@ public class FinBillTrailerVo implements Vo { private String billTypeKey; // 开票类型key @ApiModelProperty("开票类型value") private String billTypeValue; // 开票类型value + @ApiModelProperty(value = "开票名称sid") + private String openTickSid; @ApiModelProperty("开票名称") private String openTickName; // 开票名称 @ApiModelProperty("开票申请单sid") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java index 78ed96172f..83b1a69e11 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java @@ -15,6 +15,8 @@ public class VinListDto implements Dto { private String invoiceTypeKey; @ApiModelProperty("开票类型") private String invoiceType; + @ApiModelProperty(value = "开票名称sid") + private String openTickSid; @ApiModelProperty("开票名称") private String invoiceName; @ApiModelProperty("开票信息") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java index 539f57a1a3..4ae9e454b6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java @@ -16,6 +16,8 @@ public class VinListVo implements Vo { private String invoiceTypeKey; @ApiModelProperty("开票类型") private String invoiceType; + @ApiModelProperty(value = "开票名称sid") + private String openTickSid; @ApiModelProperty("开票名称") private String invoiceName; @ApiModelProperty("开票信息") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index 38305607e3..2329768f63 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -34,29 +34,37 @@ import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteA import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppSubmitAdvanceInvoiceDto; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeQuery; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo; +import com.yxt.anrui.fin.api.finbillapplication.*; +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.scm.api.scmvehiclegression.flowable.*; import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.*; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerDto; import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery; import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery; import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto; import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.SubmitAdvanceInvoiceDto; import com.yxt.anrui.terminal.api.autoservice.intermediary.MiddlemanVo; +import com.yxt.anrui.terminal.api.autoservice.invoiced.*; +import com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.BusOrderSalesVo; import com.yxt.anrui.terminal.config.CoverUtils; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; @@ -79,18 +87,48 @@ public class AppBusAdvanceGinvoiceapplyService { @Autowired BusAdvanceGinvoiceapplyFeign busAdvanceGinvoiceapplyFeign; @Autowired + FinBillApplicationFeign finBillApplicationFeign; + @Autowired private SysUserFeign sysUserFeign; @Autowired private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; public ResultBean> getAdvanceInvoiceList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); - PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); - ResultBean> resultBean = busAdvanceGinvoiceapplyFeign.getAdvanceInvoiceList(pq); - List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AdvanceInvoicePageVo.class)).collect(Collectors.toList()); + PagerQuery pq = new PagerQuery<>(); + AdvanceInvoicePageQuery params = pagerQuery.getParams(); + FinBillApplicationQuery params1 = new FinBillApplicationQuery(); + params1.setOrgPath(params.getOrgPath()); + params1.setCreateBySid(params.getUserSid()); + params1.setCustomerName(params.getName()); + pq.setParams(params1); + ResultBean> resultBean = finBillApplicationFeign.listPageQK(pq); + List advanceInvoicePageVos = new ArrayList<>(); PagerVo v = new PagerVo<>(); - BeanUtil.copyProperties(resultBean.getData(), v); - v.setRecords(voList); + List records = resultBean.getData().getRecords(); + for (FinBillApplicationVo record : records) { + AdvanceInvoicePageVo advanceInvoicePageVo = new AdvanceInvoicePageVo(); + advanceInvoicePageVo.setSid(record.getSid()); + advanceInvoicePageVo.setContractId(record.getContractNo()); + advanceInvoicePageVo.setArrearsMoney(record.getArrearsMoney()); + advanceInvoicePageVo.setPaymentDate(record.getReturnedMoneyDate()); + advanceInvoicePageVo.setApplicant(record.getCreateByName()); + advanceInvoicePageVo.setNumber(record.getNum().toString()); + advanceInvoicePageVo.setReason(record.getArrearsOpenYYValue()); + advanceInvoicePageVo.setDate(record.getApplyDate()); + advanceInvoicePageVo.setCustomerName(record.getCustomerName()); + if (record.getNodeState().equals("待提交")){ + advanceInvoicePageVo.setShowUpdateBtn(true); + advanceInvoicePageVo.setShowDeleteBtn(true); + }else { + advanceInvoicePageVo.setShowUpdateBtn(false); + advanceInvoicePageVo.setShowDeleteBtn(false); + } + advanceInvoicePageVos.add(advanceInvoicePageVo); + } + v.setRecords(advanceInvoicePageVos); return rb.success().setData(v); } @@ -104,28 +142,201 @@ public class AppBusAdvanceGinvoiceapplyService { public ResultBean initAdvanceInvoice(AdvanceInvoiceInfoQuery query) { ResultBean rb = ResultBean.fireFail(); AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo(); - AppAdvanceInvoiceInfoQuery appAdvanceInvoiceInfoQuery = new AppAdvanceInvoiceInfoQuery(); - BeanUtil.copyProperties(query, appAdvanceInvoiceInfoQuery); - ResultBean resultBean = busAdvanceGinvoiceapplyFeign.initAdvanceInvoice(appAdvanceInvoiceInfoQuery); + AppBillApplicationDetailsQKQuery appBillApplicationDetailsQKQuery = new AppBillApplicationDetailsQKQuery(); + BeanUtil.copyProperties(query, appBillApplicationDetailsQKQuery); + ResultBean resultBean = finBillApplicationFeign.appQKFetchDetailsBySid(appBillApplicationDetailsQKQuery); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } - AppAdvanceInvoiceInfoVo appAdvanceInvoiceInfoVo = resultBean.getData(); - BeanUtil.copyProperties(appAdvanceInvoiceInfoVo, vo); + FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); + BeanUtil.copyProperties(finBillApplicationDetailsVo, vo); + 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.setOpenTickName(finBillApplicationDetailsVo.getOpenTickName()); + vo.setContractId(finBillApplicationDetailsVo.getContractNo()); + vo.setDate(finBillApplicationDetailsVo.getApplyDate()); + vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid()); + vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName()); + //车辆信息 + List vinListVos = new ArrayList<>(); + List finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles(); + 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 finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers(); + List 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 files = new ArrayList<>(); + files.add(hgzImageUrl); + finBillTrailerVo.setFiles(files); + finBillTrailerVos.add(finBillTrailerVo); + } + } + vo.setFinBillTrailers(finBillTrailerVos); + //附件信息 + List khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs(); + List kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs(); + List cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs(); + List zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs(); + List customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书 + List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 + List registerContractImages = new ArrayList<>();//车辆登记合同 + List idCardImages = new ArrayList<>(); + if (zjApplicationAppendxs.size() > 0){ + for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { + idCardImages.add(zjApplicationAppendx.getFileUrl()); + } + } + if (khkpsqsApplicationAppendxs.size() > 0){ + for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { + customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); + } + } + if (kpxxqrsApplicationAppendxs.size() > 0){ + for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { + invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); + } + } + if (cldjhtApplicationAppendxs.size() > 0){ + 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.setCanEdit(false); + vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); + }else { + vo.setCanEdit(true); + } return rb.success().setData(vo); } public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) { - AppAdvanceInvoiceDto appAdvanceInvoiceDto = new AppAdvanceInvoiceDto(); - BeanUtil.copyProperties(dto, appAdvanceInvoiceDto); - ResultBean resultBean = busAdvanceGinvoiceapplyFeign.saveAdvanceInvoice(appAdvanceInvoiceDto); + FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); + BeanUtil.copyProperties(dto, finBillApplicationDto); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); + finBillApplicationDto.setUseOrgSid(useOrgSid); + finBillApplicationDto.setCreateBySid(dto.getUserSid()); + finBillApplicationDto.setTotalBillMoney(dto.getInvoiceMoney()); + finBillApplicationDto.setOrgSidPath(dto.getOrgPath()); + finBillApplicationDto.setSaleTypeValue(dto.getSaleType()); + finBillApplicationDto.setSaleDeptName(dto.getSellerName()); + finBillApplicationDto.setStaffName(dto.getSellerName()); + finBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName()); + finBillApplicationDto.setCustomerName(dto.getName()); + finBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney()); + finBillApplicationDto.setOpenTickName(dto.getOpenTickName()); + finBillApplicationDto.setContractNo(dto.getContractId()); + finBillApplicationDto.setApplyDate(dto.getDate()); + finBillApplicationDto.setCreateBySid(dto.getUserSid()); + finBillApplicationDto.setNodeState(dto.getNodeState()); + finBillApplicationDto.setBillNo(dto.getBillNo()); + String publishInfo = dto.getPublishInfo(); + String[] split = publishInfo.split("-"); + finBillApplicationDto.setDeptName(split[0]); + finBillApplicationDto.setCreateByName(split[1]); + //开票车辆信息 + List vinList = dto.getVinList(); + List finBillVehicleDtos = new ArrayList<>(); + for (AppCarListDto vinListDto : vinList) { + FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto(); + finBillVehicleDto.setVinNo(vinListDto.getVin()); + finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey()); + finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState()); + finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey()); + finBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType()); + finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName()); + finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo()); + finBillVehicleDtos.add(finBillVehicleDto); + } + finBillApplicationDto.setFinBillVehicles(finBillVehicleDtos); + //开票挂车信息 + List finBillTrailers = dto.getFinBillTrailers(); + List finBillTrailerDtos = new ArrayList<>(); + if (finBillTrailers != null && finBillTrailers.size() > 0){ + for (com.yxt.anrui.terminal.api.autoservice.advanceInvoice.FinBillTrailerDto finBillTrailer : finBillTrailers) { + com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); + BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto); + finBillTrailerDtos.add(finBillTrailerDto); + } + } + finBillApplicationDto.setFinBillTrailers(finBillTrailerDtos); + //附件信息 + List customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书 + List invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书 + List registerContractImages = dto.getRegisterContractImages();//车辆登记合同 + List idCardImages = dto.getIdCardImages();//证件 + List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 + List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 + List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 + List idCardImagesPC = new ArrayList<>();//证件 + if (customerInvoiceApplyImages != null){ + for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(customerInvoiceApplyImage); + khkpsqsApplicationAppendxs.add(finBillFileDto); + } + } + if (invoiceApplyConfirmImages != null){ + for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(invoiceApplyConfirmImage); + kpxxqrsApplicationAppendxs.add(finBillFileDto); + } + } + if (registerContractImages != null){ + for (String registerContractImage : registerContractImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(registerContractImage); + cldjhtApplicationAppendxs.add(finBillFileDto); + } + } + if (idCardImages != null){ + for (String idCardImage : idCardImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(idCardImage); + idCardImagesPC.add(finBillFileDto); + } + } + finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); + finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); + finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); + finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC); + ResultBean resultBean = finBillApplicationFeign.save(finBillApplicationDto); return resultBean; } public ResultBean deleteAdvanceInvoice(AdvanceInvoiceInfoQuery query) { - AppAdvanceInvoiceInfoQuery appAdvanceInvoiceInfoQuery = new AppAdvanceInvoiceInfoQuery(); - BeanUtil.copyProperties(query, appAdvanceInvoiceInfoQuery); - ResultBean resultBean = busAdvanceGinvoiceapplyFeign.deleteAdvanceInvoice(appAdvanceInvoiceInfoQuery); + List stringList = new ArrayList<>(); + stringList.add(query.getSid()); + String[] sids = stringList.toArray(new String[0]); + ResultBean resultBean = finBillApplicationFeign.delBySids(sids); return resultBean; } 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 e32c2e1d29..4680f8b6ea 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 @@ -109,6 +109,7 @@ public class InvoicedService { } FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); BeanUtil.copyProperties(finBillApplicationDetailsVo, vo); + vo.setOpenTickSid(finBillApplicationDetailsVo.getOpenTickSid()); vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid()); vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney()); vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath()); @@ -137,6 +138,7 @@ public class InvoicedService { vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue()); vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey()); vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue()); + vinListVo.setOpenTickSid(finBillVehicle.getOpenTickSid()); vinListVo.setInvoiceName(finBillVehicle.getOpenTickName()); vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks()); vinListVos.add(vinListVo); @@ -295,7 +297,7 @@ public class InvoicedService { finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC); - ResultBean resultBean = finBillApplicationFeign.save(finBillApplicationDto); + ResultBean resultBean = finBillApplicationFeign.saveQK(finBillApplicationDto); return resultBean; }