From 8005393b95a7a74b01c061e2dd2ae58c0b716171 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 24 Apr 2023 15:40:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E9=94=80=E5=94=AE=E5=8F=B0=E8=B4=A6=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleZSOutDto.java | 2 + .../basevehicleout/BaseVehicleOutMapper.java | 3 + .../basevehicleout/BaseVehicleOutService.java | 305 ++++++++---------- .../contract/AppRovalContractPageVo.java | 10 +- .../bussalesorder/BusSalesOrderMapper.java | 2 + .../biz/bussalesorder/BusSalesOrderMapper.xml | 18 ++ .../bussalesorder/BusSalesOrderService.java | 40 +-- .../autoservice/approval/AppRovalFeign.java | 5 + .../approval/AppVehicleQKKPQuery.java | 23 ++ .../approval/AppVehicleQKKPTrailerVo.java | 20 ++ .../approval/AppVehicleQKKPVo.java | 31 ++ .../approval/RovalContractPageQuery.java | 2 - .../approval/RovalContractPageVo.java | 9 +- .../autoservice/approval/AppRovalRest.java | 9 +- .../autoservice/approval/AppRovalService.java | 15 + 15 files changed, 275 insertions(+), 219 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPTrailerVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleZSOutDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleZSOutDto.java index a5ede5a8ed..9adc41b069 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleZSOutDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleZSOutDto.java @@ -59,4 +59,6 @@ public class BaseVehicleZSOutDto implements Dto { private String materialTypeValue; @ApiModelProperty("物料sid") private String materialSid; + @ApiModelProperty("财务中客户编码") + private String cwCustomerNo; // 财务中客户编码 } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java index d117f70ffc..3af51bbc65 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java @@ -40,4 +40,7 @@ public interface BaseVehicleOutMapper extends BaseMapper { BaseVehicleOutDetailsVo selByOrgSidAndVehSid(@Param("useOrgSid") String useOrgSid,@Param("vehSid") String vehSid); List selByExcel(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from base_vehicle_out where materialSid = #{vinSid}") + BaseVehicleOut setByVinSid(String vinSid); } 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 da91944da3..a34c64f5a1 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 @@ -461,7 +461,7 @@ public class BaseVehicleOutService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid); - if (resultBean.getSuccess()) { - SysOrganizationVo vo = resultBean.getData(); - if (vo != null) { - salOutStock.setFSaleDeptID(vo.getOrgCode()); - } - } - //项目类别key和项目类别type - salOutStock.setF_PAEZ_AssistantType("payType"); - //销售类型-外采挂车映射 - salOutStock.setF_PAEZ_AssistantKey("009"); - //物料列表 - List fEntityList = new ArrayList<>(); - SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); - //单价 - fEntity.setFPrice(dto.getPrice()); - //物料编码 - fEntity.setFMaterialID(dto.getMaterialCode()); - //仓库id - fEntity.setFStockID("ARZSCK"); - fEntityList.add(fEntity); - if (fEntityList.size() > 0) { - salOutStock.setFEntity(fEntityList); - return salOutStock; - } - return null; - } - - private SalOutStock createZSSZOutStock(BaseVehicle baseVehicle, BaseVehicleZSOutDto dto, BaseVehicleZSOutApplyDto appDto) { - SalOutStock salOutStock = new SalOutStock(); - //单据编号 - salOutStock.setFBillNo(appDto.getBillNo() + "-1"); - //日期 - salOutStock.setFDate(DateUtil.today()); - //分公司id - String purchaseSystemSid = baseVehicle.getPurchaseSystemSid(); - BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData(); - salOutStock.setFSaleOrgId(basePurchaseSystemDetailsVo.getOrgCode()); - //客户 - salOutStock.setFCustomerID(appDto.getCwCustomerNo()); + salOutStock.setFCustomerID(dto.getCwCustomerNo()); //销售部门id String orgDeptSid = appDto.getOrgSid(); ResultBean resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid); @@ -532,7 +490,7 @@ public class BaseVehicleOutService extends MybatisBaseService fEntityList = new ArrayList<>(); SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); //单价 - fEntity.setFPrice(dto.getPrice()); + fEntity.setFPrice(dto.getPrice().toString()); //物料编码 fEntity.setFMaterialID(dto.getMaterialCode()); //仓库id @@ -937,7 +895,7 @@ public class BaseVehicleOutService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(orgDeptSid); @@ -971,14 +929,14 @@ public class BaseVehicleOutService extends MybatisBaseService fEntityList = new ArrayList<>(); SalOutStock.FEntity fEntity = new SalOutStock.FEntity(); //单价 - fEntity.setFPrice(dto.getPrice()); + fEntity.setFPrice(dto.getPrice().toString()); //物料编码 fEntity.setFMaterialID(dto.getVinNo().substring(dto.getVinNo().length() - 8)); //仓库id fEntity.setFStockID("ARZSCK"); //销售折让 - if (StringUtils.isNotBlank(dto.getSalesAllowance())) { - fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance()); + if (StringUtils.isNotBlank(dto.getSalesAllowance().toString())) { + fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance().toString()); } if (StringUtils.isNotBlank(dto.getGiftsDescription())) { fEntity.setF_PAEZ_Decimal4(dto.getGiftsDescription()); @@ -993,36 +951,36 @@ public class BaseVehicleOutService extends MybatisBaseService zcDtos = baseVehicleZSOutApplyDto.getBaseVehicleZSOutDtos(); List gcOrSzDtos = new ArrayList<>(); SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseVehicleZSOutApplyDto.getCreateOrgSid()).getData(); + //生成出库单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "XSCKD" + sysOrganizationVo.getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + //出库主表信息录入 + BaseVehicleOutApply baseVehicleOutApply = new BaseVehicleOutApply(); + baseVehicleOutApply.setBillNo(billNo); + baseVehicleOutApply.setSaleDate(baseVehicleZSOutApplyDto.getSaleDate()); + baseVehicleOutApply.setCustomerSid(baseVehicleZSOutApplyDto.getCustomerSid()); + baseVehicleOutApply.setCustomerName(baseVehicleZSOutApplyDto.getCustomerName()); + baseVehicleOutApply.setMobile(baseVehicleZSOutApplyDto.getMobile()); + baseVehicleOutApply.setOrgSid(baseVehicleZSOutApplyDto.getOrgSid()); + baseVehicleOutApply.setOrgName(baseVehicleZSOutApplyDto.getOrgName()); + baseVehicleOutApply.setStaffSid(baseVehicleZSOutApplyDto.getStaffSid()); + baseVehicleOutApply.setStaffName(baseVehicleZSOutApplyDto.getStaffName()); + baseVehicleOutApply.setMakeListSid(baseVehicleZSOutApplyDto.getCreateBySid()); + baseVehicleOutApply.setMakeListName(baseVehicleZSOutApplyDto.getCreateByName()); + baseVehicleOutApply.setMakeListDate(DateUtil.format(new Date(), "yyyy-MM-dd")); + baseVehicleOutApply.setSaleTypeKey(baseVehicleZSOutApplyDto.getSaleTypeKey()); + baseVehicleOutApply.setSaleTypeValue(baseVehicleZSOutApplyDto.getSaleTypeValue()); + baseVehicleOutApply.setCreateOrgSid(baseVehicleZSOutApplyDto.getCreateOrgSid()); + baseVehicleOutApply.setCreateBySid(baseVehicleZSOutApplyDto.getCreateBySid()); + //内部引荐人、内部引荐人sid + baseVehicleOutApply.setInnerName(baseVehicleZSOutApplyDto.getInnerName()); + baseVehicleOutApply.setInnerUserSid(baseVehicleZSOutApplyDto.getInnerUserSid()); + baseVehicleOutApply.setContractNo(baseVehicleZSOutApplyDto.getContractNo()); + baseVehicleOutApply.setCustomerNo(baseVehicleZSOutApplyDto.getCustomerNo()); + //baseVehicleOutApply.setCwCustomerNo(bdCustomer.getFNumber()); + baseVehicleOutApply.setBusSid(baseVehicleZSOutApplyDto.getBusSid()); + //保存车辆出库单主表 + baseVehicleOutApplyService.save(baseVehicleOutApply); + //主车 for (BaseVehicleZSOutDto dto : zcDtos) { Boolean b = false; //获取主车sid @@ -1516,7 +1512,7 @@ public class BaseVehicleOutService extends MybatisBaseService 0) { for (BaseTrailerVo baseTrailerVo : baseTrailerVos) { baseVehicleZSOutDto.setPrice(baseTrailerVo.getDealPrice()); - baseVehicleZSOutDto.setMaterialCode(baseTrailerVo.getVinNo() + "G"); + baseVehicleZSOutDto.setMaterialCode(baseTrailerVo.getVinNo()); baseVehicleZSOutDto.setMaterialSid(baseTrailerVo.getSid()); baseVehicleZSOutDto.setMaterialName("挂车"); baseVehicleZSOutDto.setMaterialTypeKey("002"); @@ -1529,77 +1525,27 @@ public class BaseVehicleOutService extends MybatisBaseService baseVehinstalls = baseVehinstallService.selectByOrgSidAndVin(baseVehicleZSOutApplyDto.getCreateOrgSid(), dto.getVinNo()); for (BaseVehinstall baseVehinstall : baseVehinstalls) { baseVehicleZSOutDto.setPrice(baseVehinstall.getGuidePrice()); - baseVehicleZSOutDto.setMaterialCode(dto.getVinNo() + "SZ"); + baseVehicleZSOutDto.setMaterialCode(dto.getMaterialCode()); baseVehicleZSOutDto.setMaterialSid(baseVehinstall.getSid()); baseVehicleZSOutDto.setMaterialName("上装"); baseVehicleZSOutDto.setMaterialTypeKey("003"); baseVehicleZSOutDto.setMaterialTypeValue("上装"); baseVehicleZSOutDto.setVinSid(materialSid); - baseVehicleZSOutDto.setVinNo(baseVehinstall.getVinNo()); + baseVehicleZSOutDto.setVinNo(dto.getMaterialCode()); gcOrSzDtos.add(baseVehicleZSOutDto); } } - //生成出库单据编号 - String billNo = ""; - String date = DateUtil.format(DateUtil.date(), "yyyyMM"); - billNo = "XSCKD" + sysOrganizationVo.getOrgCode() + date; - String i = baseMapper.selectNum(billNo); - if (StringUtils.isNotBlank(i)) { - billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); - } else { - billNo = Rule.getBillNo(billNo, 0); - } - //出库主表信息录入 - BaseVehicleOutApply baseVehicleOutApply = new BaseVehicleOutApply(); - baseVehicleOutApply.setBillNo(billNo); - baseVehicleOutApply.setSaleDate(baseVehicleZSOutApplyDto.getSaleDate()); - baseVehicleOutApply.setCustomerSid(baseVehicleZSOutApplyDto.getCustomerSid()); - baseVehicleOutApply.setCustomerName(baseVehicleZSOutApplyDto.getCustomerName()); - baseVehicleOutApply.setMobile(baseVehicleZSOutApplyDto.getMobile()); - baseVehicleOutApply.setOrgSid(baseVehicleZSOutApplyDto.getOrgSid()); - baseVehicleOutApply.setOrgName(baseVehicleZSOutApplyDto.getOrgName()); - baseVehicleOutApply.setStaffSid(baseVehicleZSOutApplyDto.getStaffSid()); - baseVehicleOutApply.setStaffName(baseVehicleZSOutApplyDto.getStaffName()); - baseVehicleOutApply.setMakeListSid(baseVehicleZSOutApplyDto.getCreateBySid()); - baseVehicleOutApply.setMakeListName(baseVehicleZSOutApplyDto.getCreateByName()); - baseVehicleOutApply.setMakeListDate(DateUtil.format(new Date(), "yyyy-MM-dd")); - baseVehicleOutApply.setSaleTypeKey(baseVehicleZSOutApplyDto.getSaleTypeKey()); - baseVehicleOutApply.setSaleTypeValue(baseVehicleZSOutApplyDto.getSaleTypeValue()); - baseVehicleOutApply.setCreateOrgSid(baseVehicleZSOutApplyDto.getCreateOrgSid()); - baseVehicleOutApply.setCreateBySid(baseVehicleZSOutApplyDto.getCreateBySid()); - //内部引荐人、内部引荐人sid - baseVehicleOutApply.setInnerName(baseVehicleZSOutApplyDto.getInnerName()); - baseVehicleOutApply.setInnerUserSid(baseVehicleZSOutApplyDto.getInnerUserSid()); - baseVehicleOutApply.setContractNo(baseVehicleZSOutApplyDto.getContractNo()); - baseVehicleOutApply.setCustomerNo(bdCustomer.getFNumber()); - baseVehicleOutApply.setCwCustomerNo(bdCustomer.getFNumber()); - baseVehicleOutApply.setBusSid(baseVehicleZSOutApplyDto.getBusSid()); - //保存车辆出库单主表 - baseVehicleOutApplyService.save(baseVehicleOutApply); //构建子表数据 BaseVehicleOut baseVehicleOut = new BaseVehicleOut(); BeanUtil.copyProperties(dto, baseVehicleOut, "sid"); //主车 - if (dto.getMaterialTypeKey().equals("001")) { - if ("002".equals(baseVehicle.getManPurOrderTypeKey())) { - baseVehicleOut.setZcMGroupCode("99.01"); - baseVehicleOut.setZcMGroupName("外采主车"); - } else { - BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(baseVehicle.getCarBrandSid()); - baseVehicleOut.setZcMGroupCode(baseVehicleBrand.getBrandCode()); - baseVehicleOut.setZcMGroupName(baseVehicleBrand.getBrandName()); - } - } else if (dto.getMaterialTypeKey().equals("002")) {//挂车 - baseVehicleOut.setZcMGroupCode("99.02"); - baseVehicleOut.setZcMGroupName("挂车"); - //BaseTrailer baseTrailer = baseTrailerService.fetchBySid(dto.getMaterialSid()); - //baseVehicleOut.setMaterialCode(baseTrailer.getVinNo().substring(baseTrailer.getVinNo().length() - 8) + "G"); - baseVehicleOut.setMaterialCode(dto.getMaterialCode()); - } else if (dto.getMaterialTypeKey().equals("003")) {//上装 - baseVehicleOut.setZcMGroupCode("99.02"); - baseVehicleOut.setZcMGroupName("挂车"); - //baseVehicleOut.setMaterialCode(baseVehicleOut.getVinNo().substring(baseVehicleOut.getVinNo().length() - 8) + "SZ"); - baseVehicleOut.setMaterialCode(dto.getMaterialCode()); + if ("002".equals(baseVehicle.getManPurOrderTypeKey())) { + baseVehicleOut.setZcMGroupCode("99.01"); + baseVehicleOut.setZcMGroupName("外采主车"); + } else { + BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(baseVehicle.getCarBrandSid()); + baseVehicleOut.setZcMGroupCode(baseVehicleBrand.getBrandCode()); + baseVehicleOut.setZcMGroupName(baseVehicleBrand.getBrandName()); } if (StringUtils.isNotBlank(dto.getPrice())) { baseVehicleOut.setPrice(new BigDecimal(dto.getPrice())); @@ -1627,79 +1573,96 @@ public class BaseVehicleOutService extends MybatisBaseService { * @return */ BusSaleOrderVehicleOutVo selectOrderOne(String vinSid); + + IPage selectByStaffSid(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file 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 a0d26f8038..6b3fcc9a8c 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 @@ -377,4 +377,22 @@ 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/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 89bf55e8a1..6e879b68d6 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 @@ -26,6 +26,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorder; 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; @@ -50,10 +51,7 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign; import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign; import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo; -import com.yxt.anrui.base.api.commoncontract.CommonContract; -import com.yxt.anrui.base.api.commoncontract.CommonContractBuscenterVo; -import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; -import com.yxt.anrui.base.api.commoncontract.CommonContractVo; +import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.CommonContractEnum; import com.yxt.anrui.base.common.enums.VehicleState; @@ -5287,33 +5285,19 @@ public class BusSalesOrderService extends MybatisBaseService qw = new QueryWrapper<>(); - qw.eq("bo.staffSid", sysUserVo.getStaffSid()); - List vinList = new ArrayList(); - if (params.getStateType() == 1) { - List data = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData(); - for (BaseVehicleTempstateVo datum : data) { - BaseVehicleSelectVo vehicleSelectVo = baseVehicleFeign.details(datum.getVehSid()).getData(); - vinList.add(vehicleSelectVo.getVinNo()); - } - } else if (params.getStateType() == 2) { - List data = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getCode()).getData(); - for (BaseVehicleTempstateVo datum : data) { - BaseVehicleSelectVo vehicleSelectVo = baseVehicleFeign.details(datum.getVehSid()).getData(); - vinList.add(vehicleSelectVo.getVinNo()); - } - } - if (vinList.size() > 0) { - qw.notIn("bsov.linkNo", vinList); + qw.eq("staffSid",sysUserVo.getStaffSid()); + qw.eq("orgSid",sysUserVo.getDepartmentSid()); + if (StringUtils.isNotBlank(params.getName())){ + qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName())); } + qw.orderByDesc("createDate"); IPage page = PagerUtil.queryToPage(pagerQuery); - IPage iPage = baseMapper.getApprovalContractList(page, qw, params.getName()); + IPage iPage = baseMapper.selectByStaffSid(page, qw); for (AppRovalContractPageVo record : iPage.getRecords()) { - String busSid = record.getBusSid(); - CommonContractVo commonContract = commonContractFeign.getContractBySalesOrderSid(busSid).getData(); - if (commonContract != null) { - record.setContractId(commonContract.getContractNo()); - record.setContractSid(commonContract.getSid()); - } + String createDate = record.getCreateDate(); + DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd"); + createDate = DateUtil.formatDate(dateTime); + record.setCreateDate(createDate); } return iPage; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java index 2fa613b939..9e352cbb0f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeign.java @@ -34,4 +34,9 @@ public interface AppRovalFeign { @ResponseBody public ResultBean> getApprovalContractList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("移动端-欠款开票选择车辆列表") + @PostMapping("/getVehicleQKKPList") + @ResponseBody + public ResultBean> getVehicleQKKPList(@RequestBody PagerQuery pagerQuery); + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPQuery.java new file mode 100644 index 0000000000..bb7d52e231 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPQuery.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.terminal.api.autoservice.approval; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/4/22 8:49 + * @Description + */ +@Data +public class AppVehicleQKKPQuery implements Query { + + @ApiModelProperty(value = "合同编号") + private String contractNo; + @ApiModelProperty(value = "车辆sid") + private List vinSids; + @ApiModelProperty("车架号") + private String vinNo; // 车架号 +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPTrailerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPTrailerVo.java new file mode 100644 index 0000000000..a99667d013 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPTrailerVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.terminal.api.autoservice.approval; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/22 8:49 + * @Description + */ +@Data +public class AppVehicleQKKPTrailerVo implements Vo { + + @ApiModelProperty("挂车车架号") + private String gcVinNo; // 挂车车架号 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPVo.java new file mode 100644 index 0000000000..a70c3e874d --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppVehicleQKKPVo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.terminal.api.autoservice.approval; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/4/22 8:49 + * @Description + */ +@Data +public class AppVehicleQKKPVo implements Vo { + + @ApiModelProperty(value = "合同编号") + private String contractNo; + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("合格证状态key") + private String certificateState; // 合格证状态key + @ApiModelProperty("合格证状态value") + private String certificateStateValue; // 合格证状态value + @ApiModelProperty(value = "挂车信息") + private List trailers; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java index 48268ce14f..859c4a398b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java @@ -10,10 +10,8 @@ public class RovalContractPageQuery implements Query { @ApiModelProperty("用户sid") private String userSid; - @ApiModelProperty("车架号 客户名称 合同编号") private String name; - @ApiModelProperty("状态") private int stateType; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageVo.java index e332ff8d4f..02da56638f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageVo.java @@ -11,21 +11,16 @@ public class RovalContractPageVo implements Vo { @ApiModelProperty("合同sid") private String contractSid; - @ApiModelProperty("合同编号") private String contractId; - - @ApiModelProperty("车架号") - private String vin; - @ApiModelProperty("销售订单sid") private String busSid; - @ApiModelProperty("客户名称") private String customerName; - @ApiModelProperty("车型名称") private String modelName; + @ApiModelProperty("合同审核日期") + private String createDate; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalRest.java index 4f0a718988..25f7e48735 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalRest.java @@ -25,9 +25,7 @@ *********************************************************/ package com.yxt.anrui.terminal.biz.autoservice.approval; -import com.yxt.anrui.terminal.api.autoservice.approval.AppRovalFeign; -import com.yxt.anrui.terminal.api.autoservice.approval.RovalContractPageQuery; -import com.yxt.anrui.terminal.api.autoservice.approval.RovalContractPageVo; +import com.yxt.anrui.terminal.api.autoservice.approval.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -62,4 +60,9 @@ public class AppRovalRest implements AppRovalFeign { public ResultBean> getApprovalContractList(PagerQuery pagerQuery) { return appRovalService.getApprovalContractList(pagerQuery); } + + @Override + public ResultBean> getVehicleQKKPList(PagerQuery pagerQuery) { + return appRovalService.getVehicleQKKPList(pagerQuery); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java index e1b1cdc030..a4995e66c6 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java @@ -28,9 +28,14 @@ package com.yxt.anrui.terminal.biz.autoservice.approval; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPQuery; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; +import com.yxt.anrui.terminal.api.autoservice.approval.AppVehicleQKKPQuery; +import com.yxt.anrui.terminal.api.autoservice.approval.AppVehicleQKKPVo; import com.yxt.anrui.terminal.api.autoservice.approval.RovalContractPageQuery; import com.yxt.anrui.terminal.api.autoservice.approval.RovalContractPageVo; import com.yxt.anrui.terminal.config.CoverUtils; @@ -59,6 +64,8 @@ public class AppRovalService { @Autowired BusSalesOrderFeign busSalesOrderFeign; + @Autowired + BaseVehicleFeign baseVehicleFeign; public ResultBean> getApprovalContractList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -67,4 +74,12 @@ public class AppRovalService { PagerVo vo = CoverUtils.selectPagerVo(approvalContractList.getData()); return rb.success().setData(vo); } + + public ResultBean> getVehicleQKKPList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); + ResultBean> pagerVoResultBean = baseVehicleFeign.vehicleQKKPList(pq); + PagerVo vo = CoverUtils.selectPagerVo(pagerVoResultBean.getData()); + return rb.success().setData(vo); + } } \ No newline at end of file