From cc33931660d2246ca7f847d69c0d1c0cd0984895 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 3 Apr 2023 10:53:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/BaseVehicleExportQuery.java | 12 ------ .../api/basevehicle/BaseVehicleExportVo.java | 41 ++++--------------- .../api/basevehicle/BaseVehicleFeign.java | 17 ++------ .../biz/basevehicle/BaseVehicleMapper.xml | 8 ++-- .../base/biz/basevehicle/BaseVehicleRest.java | 40 ++++++++++++++---- .../biz/basevehicle/BaseVehicleService.java | 19 +-------- 6 files changed, 50 insertions(+), 87 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java index 160fe0d345..3f05cd54b8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java @@ -20,16 +20,6 @@ public class BaseVehicleExportQuery implements Query { */ @ApiModelProperty(value = "sids", required = false) private List sids; - - // @ApiModelProperty(value = "车架号") -// private String vinNo; -// @ApiModelProperty(value = "车型名称") -// private String modelName; -// @ApiModelProperty(value = "存放地点") -// private String location; -// @ApiModelProperty(value = "车辆状态") -// private String vehicleState; - @ApiModelProperty(value = "厂家采购订单类型value") private String manPurOrderTypeValue; @ApiModelProperty(value = "厂家库龄") @@ -54,7 +44,6 @@ public class BaseVehicleExportQuery implements Query { private String vehicleState; @ApiModelProperty(value = "合格证状态value") private String certificateStateValue; - @ApiModelProperty(value = "内部编码") private String insideCode; @ApiModelProperty(value = "采购类型") @@ -63,7 +52,6 @@ public class BaseVehicleExportQuery implements Query { private String priceDate; @ApiModelProperty(value = "买断状态") private String settlementStatus; - @ApiModelProperty(value = "销售开始日期") private String salesStartDate; @ApiModelProperty(value = "销售结束日期") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportVo.java index 241157369b..e3b529b1a3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportVo.java @@ -3,7 +3,7 @@ package com.yxt.anrui.base.api.basevehicle; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.utils.ExportEntityMap; import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; @@ -16,33 +16,6 @@ import lombok.Data; public class BaseVehicleExportVo implements Vo { private static final long serialVersionUID = -1722170460354213687L; - // @ExportEntityMap(CnName = "车型名称", EnName = "modelName") -// private String modelName; -// -// @ExportEntityMap(CnName = "配置编码", EnName = "vehicleCode") -// private String vehicleCode; -// -// @ExportEntityMap(CnName = "车架号", EnName = "vinNo") -// private String vinNo; -// -// @ExportEntityMap(CnName = "发动机号/许可证号", EnName = "engineNo") -// private String engineNo; -// -// @ExportEntityMap(CnName = "制造日期", EnName = "manufactureDate") -// private String manufactureDate; -// -// @ExportEntityMap(CnName = "车辆状态", EnName = "vehicleState") -// private String vehicleState; -// -// @ExportEntityMap(CnName = "存放地点", EnName = "location") -// private String location; -// -// @ExportEntityMap(CnName = "首次发车日期", EnName = "firstStartDate") -// private String firstStartDate; -// -// @ExportEntityMap(CnName = "库龄", EnName = "libraryAge") -// private String libraryAge; - @ExportEntityMap(CnName = "序号", EnName = "rankNo") private Integer rankNo; @ExportEntityMap(CnName = "所属公司", EnName = "createOrgName") @@ -138,6 +111,9 @@ public class BaseVehicleExportVo implements Vo { @ExportEntityMap(CnName = "厂家入库日期", EnName = "priceDate") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String priceDate; + @ExportEntityMap(CnName = "物流发车日期", EnName = "departureDate") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private String departureDate; @ExportEntityMap(CnName = "物流到车日期", EnName = "arrivalDate") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String arrivalDate; @@ -150,10 +126,12 @@ public class BaseVehicleExportVo implements Vo { private String manufSaleAccessName; @ExportEntityMap(CnName = "厂家合同价（含运费）", EnName = "contractPrice") private String contractPrice; + @ExportEntityMap(CnName = "厂家结算价（含运费）", EnName = "costPrice") + private Integer costPrice; @ExportEntityMap(CnName = "运费", EnName = "freight") private String freight; - @ExportEntityMap(CnName = "买断状态", EnName = "settlementStatus") - private String settlementStatus; + @ExportEntityMap(CnName = "买断状态", EnName = "settlementStatusValue") + private String settlementStatusValue; @ExportEntityMap(CnName = "买断日期", EnName = "solidDate") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String solidDate; @@ -184,7 +162,4 @@ public class BaseVehicleExportVo implements Vo { private String specifications; @ExportEntityMap(CnName = "系别", EnName = "departmentValue") private String departmentValue; - @ApiModelProperty("发车日期") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private String departureDate; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 487c21d9b3..8137084412 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -132,15 +132,6 @@ public interface BaseVehicleFeign { public ResultBean details(@PathVariable("sid") String sid); -// /** -// * 车辆列表导出 -// * -// * @param query 查询条件 -// */ -// @GetMapping("/exportExcel") -// @ApiOperation(value = "车辆列表导出") -// public void exportExcel(BaseVehicleExportQuery query); - /** * 车辆台账列表导出 * @@ -152,7 +143,6 @@ public interface BaseVehicleFeign { public void exportExcel(@RequestBody BaseVehicleExportQuery baseVehicleExportQuery) throws ParseException; - /** * 删除、批量删除 * @@ -361,9 +351,10 @@ public interface BaseVehicleFeign { @ApiOperation("app销售订单-根据车型和配置sid查询现车列表") @GetMapping("/selectAppList") ResultBean> selectAppList(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "configSid") String configSid, @RequestParam("orgSid") String orgSid); + @ApiOperation("app销售订单-根据车型和配置sid查询现车列表") @GetMapping("/selectAppListOne") - ResultBean> selectAppListOne(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "configSid") String configSid, @RequestParam("orgSid") String orgSid,@RequestParam("list")List list); + ResultBean> selectAppListOne(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "configSid") String configSid, @RequestParam("orgSid") String orgSid, @RequestParam("list") List list); @ApiOperation("费用申请选择现车分页列表") @@ -507,12 +498,12 @@ public interface BaseVehicleFeign { @ApiOperation("根据车辆sid获取采购系统信息") @GetMapping("/getSystem") @ResponseBody - ResultBean getSystem(@RequestParam("sid")String sid); + ResultBean getSystem(@RequestParam("sid") String sid); @ApiOperation("根据车辆sid获取采购系统信息：采购系统取自车辆表中") @GetMapping("/getSystemVehicle") @ResponseBody - ResultBean getSystemVehicle(@RequestParam("sid")String sid); + ResultBean getSystemVehicle(@RequestParam("sid") String sid); @ApiOperation("根据车辆sid修改锁定状态") @GetMapping("/updateLockedState") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index d5eb7353fd..fbb1c0a073 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -2503,7 +2503,7 @@ \ No newline at end of file From 04289d39bc0c29cb284bb68d1b22b1f225212381 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 3 Apr 2023 11:22:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=87=BA=E5=BA=93=E7=9A=84=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/basevehicleout/BaseVehicleOutService.java | 6 ++---- .../buscenter/api/bussalesorder/BusSalesOrderFeign.java | 2 +- .../api/bussalesorder/BusSalesOrderFeignFallback.java | 2 +- .../buscenter/biz/bussalesorder/BusSalesOrderMapper.java | 2 +- .../buscenter/biz/bussalesorder/BusSalesOrderMapper.xml | 4 +++- .../buscenter/biz/bussalesorder/BusSalesOrderRest.java | 4 ++-- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 92acc323c1..2d73b51b31 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportVo; import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailer; @@ -30,7 +29,6 @@ import com.yxt.anrui.base.biz.commoncontract.CommonContractService; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; -import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; @@ -142,9 +140,9 @@ public class BaseVehicleOutService extends MybatisBaseService commonContract = commonContractService.selectByNo(dto.getConcatNo()); if (commonContract.getSuccess()) { //查询合同编号和车辆sid客户的临时编码 - ResultBean stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getVinSid()); + ResultBean stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getVinSid(),dto.getConcatNo()); if (!stringResultBean.getSuccess()) { - return rb.setMsg("请检查合同是否审核"); + return rb.setMsg("请检查合同是否存在"); } String temporaryNo = stringResultBean.getData(); // Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData(); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 4e3f2df1c7..de87552392 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -277,7 +277,7 @@ public interface BusSalesOrderFeign { @ApiOperation(value = "查询客户的临时编码") @GetMapping("/selectTemporaryNo") @ResponseBody - ResultBean selectTemporaryNo(@RequestParam("vehSid")String vehSid); + ResultBean selectTemporaryNo(@RequestParam("vehSid")String vehSid, @RequestParam("contractNo")String contractNo); @ApiOperation(value = "出库初始化，根据车辆sid查询销售订单是否存在，若存在返回相关数据") @GetMapping("/selectOrderOne") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index cfef3ac5ce..1bb462164a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -251,7 +251,7 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { } @Override - public ResultBean selectTemporaryNo(String vehSid) { + public ResultBean selectTemporaryNo(String vehSid,String contractNo) { return null; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 188ac85835..19bad5481f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -192,7 +192,7 @@ public interface BusSalesOrderMapper extends BaseMapper { OrderRemarksVo getOrderRemarksInfo(String saleOrderSid); - BusSalesOrdeVo selectTemporaryNo(@Param("vehSid") String vehSid); + BusSalesOrdeVo selectTemporaryNo(@Param("vehSid") String vehSid,@Param("contractNo") String contractNo); /** * 根据车辆sid查询销售订单的数据 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 7efa6915e7..a0d26f8038 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -342,7 +342,8 @@ from bus_sales_order bo left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid where bo.nodeState = '已办结' - and bv.linkSid = #{vehSid} + and bv.linkSid = #{vehSid} and bo.contractNo = #{contractNo} + order by bo.createTime desc limit 1 @@ -373,6 +374,7 @@ left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid where bo.nodeState = '已办结' and bv.linkSid = #{vinSid} + order by bo.createTime desc limit 1 \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index 89a52ecba3..f31b13a090 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -330,8 +330,8 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { } @Override - public ResultBean selectTemporaryNo(String vehSid) { - return busSalesOrderService.selectTemporaryNo(vehSid); + public ResultBean selectTemporaryNo(String vehSid,String contractNo) { + return busSalesOrderService.selectTemporaryNo(vehSid,contractNo); } @Override diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 2b0a538022..36946a3c5d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -4934,11 +4934,11 @@ public class BusSalesOrderService extends MybatisBaseService selectTemporaryNo(String vehSid) { + public ResultBean selectTemporaryNo(String vehSid,String contractNo) { ResultBean rb = ResultBean.fireFail(); - BusSalesOrdeVo busSalesOrdeVo = baseMapper.selectTemporaryNo(vehSid); + BusSalesOrdeVo busSalesOrdeVo = baseMapper.selectTemporaryNo(vehSid,contractNo); if (busSalesOrdeVo != null) { - String contractNo = busSalesOrdeVo.getContractNo(); + contractNo = busSalesOrdeVo.getContractNo(); if (StringUtils.isBlank(contractNo)) { return rb; } From 579d587360c46d3d7c79288420cf85f0cf439d85 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 3 Apr 2023 11:30:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorder/BusSalesOrderService.java | 6 +++--- .../biz/crmcustomertemp/CrmCustomerTempService.java | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 36946a3c5d..156b409da8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -5168,7 +5168,7 @@ public class BusSalesOrderService extends MybatisBaseService sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData(); - StringBuilder deptName = new StringBuilder(); for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) { - String orgName = sysStaffOrgVo.getOrgName(); - deptName.append(orgName).append(" "); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData(); + String psid = sysOrganizationVo.getPsid(); + if (psid.equals(createOrgSid)){ + String orgName = sysStaffOrgVo.getOrgName(); + record.setDeptName(orgName); + } } - record.setDeptName(deptName.toString()); } PagerVo p = PagerUtil.pageToVo(pagging, null); return p;