From f256f1a53eccd09ea92a1c491d32411efa3c7c0f Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 20 Feb 2024 14:21:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseManufacturerRetwareService.java | 11 +- .../commoncontract/CommonContractMapper.java | 5 + .../commoncontract/CommonContractMapper.xml | 8 ++ .../commoncontract/CommonContractService.java | 132 ++++++++++++------ .../api/bussalesorder/BusSalesOrder.java | 2 + 5 files changed, 108 insertions(+), 50 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java index 0a188fec1c..088630c4f9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java @@ -43,21 +43,16 @@ import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; -import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedPdfVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; -import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb; import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.scm.api.scmapplyinboundquery.PdfPath; -import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQuery; import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDetailsVo; import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign; import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo; import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryFeign; -import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryMaterial; import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.TransformMoney; @@ -77,9 +72,7 @@ import javax.annotation.Resource; import java.io.File; import java.io.InputStream; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.util.*; -import java.util.stream.Collectors; /** * Project: anrui-base(厂家退库)
@@ -444,7 +437,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService { IPage selectcontractVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List selectcontractForHandover(@Param(Constants.WRAPPER) QueryWrapper qw); + + BusSalesOrder selectByBusSids(String busSid); + + CommonContract selectByBusSidss(String busSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml index 6c70c20fba..074cbfbae8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml @@ -271,4 +271,12 @@ modelName as model FROM common_contract ${ew.customSqlSegment} + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 6e9ca29445..53a3e169a7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1,22 +1,21 @@ package com.yxt.anrui.base.biz.commoncontract; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; 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.google.common.util.concurrent.ThreadFactoryBuilder; +import com.yxt.anrui.base.api.basedistributor.BaseDistributor; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; -import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.api.commoncontract.flowable.*; +import com.yxt.anrui.base.biz.basedistributor.BaseDistributorService; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService; @@ -43,8 +42,6 @@ import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation; import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationFeign; import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover; import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverFeign; -import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverQuery; -import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverVo; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerFileDDto; @@ -75,7 +72,6 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.config.DictCommonType; -import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultVo; import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateFeign; import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuotationQuery; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; @@ -204,6 +200,8 @@ public class CommonContractService extends MybatisBaseService createQueryWrapper(CommonContractQuery query) { @@ -821,16 +819,51 @@ public class CommonContractService extends MybatisBaseService dateString = Arrays.asList(date.split("-")); + String year = dateString.get(0); + String month = dateString.get(1); + String day = dateString.get(2); + map.put("year", year); + map.put("month", month); + map.put("day", day); + } + BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid()); + if (busSalesOrder.getAffiliatedCompanyType() == 0) { + //根据挂靠公司sid查询信息 + if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) { + BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid()); + if (baseDistributor != null) { + map.put("invoiceName", busSalesOrder.getAffiliatedCompany());//开票名称 + map.put("invoiceNo", baseDistributor.getRegistNum());//纳税人识别号 + } + } + map.put("invoiceType", busSalesOrder.getBillingType());//开票类型 + }else{ + if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){ + + } + } + //组装到文档相对应的字段中 + if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + } + } if ("现车".equals(appOrderDetailsVo.getOrderType())) { //获取模板 ftl = "existingvehicles"; if (stringList.size() > 0) { - remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); +// remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; } else { remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; } } else { - map.put("dayOne", new BigDecimal(appOrderDetailsVo.getDepositInfo().getDeposit()).multiply(new BigDecimal(num)).toString()); + map.put("dayOne", appOrderDetailsVo.getDepositInfo().getPayDepositDays()); //获取模板 ftl = "orderacar"; remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; @@ -892,16 +925,47 @@ public class CommonContractService extends MybatisBaseService dateString = Arrays.asList(date.split("-")); + String year = dateString.get(0); + String month = dateString.get(1); + String day = dateString.get(2); + map.put("year", year); + map.put("month", month); + map.put("day", day); + } + BusSalesOrder busSalesOrder = baseMapper.selectByBusSids(dto.getBusSid()); + if (busSalesOrder.getAffiliatedCompanyType() == 0) { + //根据挂靠公司sid查询信息 + if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) { + BaseDistributor baseDistributor = baseDistributorService.fetchBySid(busSalesOrder.getAffiliatedCompanySid()); + if (baseDistributor != null) { + map.put("invoiceName", busSalesOrder.getAffiliatedCompany());//开票名称 + map.put("invoiceNo", baseDistributor.getRegistNum());//纳税人识别号 + } + } + map.put("invoiceType", busSalesOrder.getBillingType());//开票类型 + } + //组装到文档相对应的字段中 + if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + } + } if ("现车".equals(appOrderDetailsVo.getOrderType())) { //获取模板 ftl = "existingvehicles"; if (stringList.size() > 0) { - remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); +// remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList); + remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; } else { remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; } } else { - map.put("dayOne", new BigDecimal(appOrderDetailsVo.getDepositInfo().getDeposit()).multiply(new BigDecimal(num)).toString()); + map.put("dayOne", appOrderDetailsVo.getDepositInfo().getPayDepositDays()); //获取模板 ftl = "orderacar"; remarks = "数量" + num + "台，单台成交价：" + transactionPrice + "元。"; @@ -972,7 +1036,7 @@ public class CommonContractService extends MybatisBaseService"); StringBuilder modelAllName2 = new StringBuilder(); modelAllName2.append("\t"); //驾驶室 @@ -2277,7 +2330,7 @@ public class CommonContractService extends MybatisBaseService invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); if (invoicingDetailsVoResultBean.getData() != null) { - map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); +// map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); createOrgName = invoicingDetailsVoResultBean.getData().getName(); } else { return rb.setMsg("请与出纳人员联系完善开票信息"); @@ -2285,14 +2338,11 @@ public class CommonContractService extends MybatisBaseService future1_2 = pool.submit(() -> { return genCarSaleContract2(dto, map, appOrderDetailsVo); }); - Future future2 = pool.submit(() -> { + /*Future future2 = pool.submit(() -> { return genCarSaleContractBlank(dto, map, appOrderDetailsVo); }); Future future2_2 = pool.submit(() -> { @@ -2354,7 +2404,7 @@ public class CommonContractService extends MybatisBaseService { return getCarContract(null, map, appOrderDetailsVo); }); - } + }*/ List filesList = new ArrayList<>(); if (future1 != null) { if (StringUtils.isNotBlank(future1.get())) { @@ -2368,7 +2418,7 @@ public class CommonContractService extends MybatisBaseService future10 = pool.submit(() -> { diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java index e569372cd5..820e54323a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java @@ -145,4 +145,6 @@ public class BusSalesOrder extends BaseEntity { @ApiModelProperty("若无值，则为现车中有车架号或其他两种类型的，若有值，则为现车中不确定车架号的数量") private String nowCarUnknownVinNum; + @ApiModelProperty("是否是挂靠公司") + private int affiliatedCompanyType; }