From c31893ab053c55c38c764afa980b56aec1e3f6ab Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 7 Jun 2023 16:05:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=8F=E8=BD=A6=E8=B5=84=E6=96=99=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E5=8D=95=E6=89=93=E5=8D=B0=E5=A2=9E=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=BC=96=E5=8F=B7=EF=BC=8C=E5=88=B6=E5=8D=95=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/common/enums/BillTypeEnum.java | 32 +++++----- .../api/bushandover/BusHandover.java | 2 + .../bushandover/BusReceiveVehiclePdfVo.java | 4 ++ .../biz/bushandover/BusHandoverMapper.java | 2 + .../biz/bushandover/BusHandoverMapper.xml | 5 ++ .../biz/bushandover/BusHandoverService.java | 40 +++++++++++- .../resources/ftl/vehicledatahandover.ftl | 61 ++++++++++++++++--- 7 files changed, 119 insertions(+), 27 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java index 315f7eeca6..48c7702c4d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java @@ -15,22 +15,22 @@ public enum BillTypeEnum { NGSQ("NGSQ", "内购申请"), TZSQ("TZSQ", "调账申请"), CJTKSQ("CJTKSQ", "厂家退库申请"), - FYSQ("FYSQ","费用申请"), - FKSQ("FKSQ","付款申请"), - KCDDBGSQ("KCDDBG","库存地点变更申请"), - JYDDDJSQ("JYDDDJSQ","简易订单订金收取"), - JYDDCLYD("JYDDCLYD","简易订单车辆预定"), - XSDDHT("XSDDHT","销售订单合同"), - XSDD("XSDD","销售订单"), - SKD("SKD","款项确认"), - KPSQ("KPSQ","公司开票申请"), - QKKP("QKKP","欠款开票"), - QKLP("QKLP","欠款领票"), - GCRK("GCRK","挂车入库"), - SZRK("SZRK","上装入库"), - XSDDTCSQ("XSDDTCSQ","销售订单退车申请"), - QKTCSQ("QKTCSQ","欠款提车申请"), - ; + FYSQ("FYSQ", "费用申请"), + FKSQ("FKSQ", "付款申请"), + KCDDBGSQ("KCDDBG", "库存地点变更申请"), + JYDDDJSQ("JYDDDJSQ", "简易订单订金收取"), + JYDDCLYD("JYDDCLYD", "简易订单车辆预定"), + XSDDHT("XSDDHT", "销售订单合同"), + XSDD("XSDD", "销售订单"), + SKD("SKD", "款项确认"), + KPSQ("KPSQ", "公司开票申请"), + QKKP("QKKP", "欠款开票"), + QKLP("QKLP", "欠款领票"), + GCRK("GCRK", "挂车入库"), + SZRK("SZRK", "上装入库"), + XSDDTCSQ("XSDDTCSQ", "销售订单退车申请"), + QKTCSQ("QKTCSQ", "欠款提车申请"), + JCZLQRD("JCZLQRD", "交车资料确认单"); private String billType; private String billTypeName; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandover.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandover.java index 62b680ebc0..151458afc0 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandover.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandover.java @@ -64,5 +64,7 @@ public class BusHandover extends BaseEntity { private String payTypeKey; @ApiModelProperty("付款方式value") private String payTypeValue; + @ApiModelProperty("交车资料确认单编号") + private String billNo; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusReceiveVehiclePdfVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusReceiveVehiclePdfVo.java index b91f87c29e..e9752b14ed 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusReceiveVehiclePdfVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusReceiveVehiclePdfVo.java @@ -40,6 +40,10 @@ public class BusReceiveVehiclePdfVo implements Vo { private String color; @ApiModelProperty("车辆型号") private String config; + @ApiModelProperty("交车资料确认单编号") + private String billNo; + @ApiModelProperty("交车资料确认单制单时间") + private Date createTime; private List listPdfVos; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.java index 0ce8c57857..6cf7318b5b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.java @@ -37,6 +37,8 @@ public interface BusHandoverMapper extends BaseMapper { IPage selectListPageVo(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + int selectNum(String bill); + /*//@Update("update bus_handover set name=#{msg} where id=#{id}") //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml index 037ebde084..dd1ca8c473 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml @@ -112,4 +112,9 @@ ORDER BY createTime DESC ,id + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java index a4fc137498..bad8e816a7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java @@ -12,7 +12,10 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; +import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.DictCommonEnum; +import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum; import com.yxt.anrui.buscenter.api.bushandover.*; @@ -36,6 +39,8 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoDetailsVo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; @@ -105,7 +110,8 @@ public class BusHandoverService extends MybatisBaseService busItemvos = dto.getBusItemvos(); for (BusHandoverItemForDeliveryDto busItemvo : busItemvos) { @@ -875,9 +884,11 @@ public class BusHandoverService extends MybatisBaseService resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.JCZLQRD.getBillType()); + String bill = Rule.getBill(b); + int i = baseMapper.selectNum(bill); + String billNo = Rule.getBillNo(bill, i); + return billNo; + } + + /** * 随车资料 * @@ -1057,8 +1088,11 @@ public class BusHandoverService extends MybatisBaseService dataMap = new HashMap(); List listPdfVos = pdfVo.getListPdfVos(); List> newList = new ArrayList<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); dataMap.put("contractNo", pdfVo.getContractNo()); dataMap.put("customerName", pdfVo.getCustomerName()); + dataMap.put("createTime",sdf.format(pdfVo.getCreateTime())); + dataMap.put("documentNumber",pdfVo.getBillNo()); if (null != listPdfVos && listPdfVos.size() > 0) { for (BusReceiveVehicleListPdfVo detailsVo : listPdfVos) { Map map = new HashMap<>(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/vehicledatahandover.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/vehicledatahandover.ftl index 76af6e1ded..90d0d0766d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/vehicledatahandover.ftl +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/vehicledatahandover.ftl @@ -11,8 +11,8 @@ Administrator FAN 2023-04-17T03:01:26Z - 2023-05-22T06:07:43Z - 11520 + 2023-06-07T06:55:06Z + 2880 1 0 0 @@ -22,8 +22,8 @@ 14 - 2052-11.1.0.14036 - 48762A60590D486E800DC51EEAB686DC_13 + 2052-11.1.0.14309 + 52537D2865394B5E9DB4335A16CB3EA3_13 @@ -401,7 +401,7 @@ - + @@ -456,14 +456,59 @@ - + - - + + + + + + + + + + 单据编号：${documentNumber!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 制单日期：${createTime!} +