diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java index 9662b0fe9f..52361f1df9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java @@ -150,4 +150,9 @@ public interface BaseVehicleCertificateFeign { @PostMapping("/certificateYJ") @ResponseBody ResultBean certificateYJ(@RequestBody BaseVehicleCertificatePushTransferDto dto); + + @ApiOperation("修改合格证的移交状态") + @PostMapping("/updateYjState") + @ResponseBody + ResultBean updateYjState(@RequestBody CertificateStateQuery query); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java index 45a8f17861..8ecb14730e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java @@ -92,4 +92,9 @@ public class BaseVehicleCertificateFeignFallback implements BaseVehicleCertifica return null; } + @Override + public ResultBean updateYjState(CertificateStateQuery query) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/CertificateStateQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/CertificateStateQuery.java new file mode 100644 index 0000000000..7cc529dad9 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/CertificateStateQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.base.api.basevehiclecertificate; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 修改合格证的移交状态 + * @author: dimengzhe + * @date: 2023/6/8 + **/ +@Data +public class CertificateStateQuery implements Query { + private static final long serialVersionUID = 616878382918214702L; + @ApiModelProperty("车辆sid") + private String vinSid; + @ApiModelProperty("移交状态key") + private String transferStateKey; + @ApiModelProperty("移交状态value") + private String transferStateValue; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java index a711b354dd..f4aea35af5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java @@ -105,4 +105,6 @@ public interface BaseVehicleCertificateMapper extends BaseMapper select vinNo,carModel,certificationNo, DATE_FORMAT(certificateDate, '%Y-%m-%d') as certificateDate,certificatePhoto from base_vehicle_certificate where vehicleSid = #{vinSid} and useOrgSid = #{useOrgSid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java index a13975820a..d51e81cf5f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java @@ -5,7 +5,6 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehiclecertificate.*; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.PagerUtil; @@ -314,6 +313,11 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign { return baseVehicleCertificateService.certificateYJ(dto); } + @Override + public ResultBean updateYjState(CertificateStateQuery query) { + return baseVehicleCertificateService.updateYjState(query); + } + /* @Override public ResultBean getCertificateInfo(String vinNo, String userSid) { return baseVehicleCertificateService.getCertificateInfo(vinNo, userSid); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java index 038c7f193d..e3c169c705 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java @@ -327,4 +327,15 @@ public class BaseVehicleCertificateService extends MybatisBaseService getDeliveryPlanInfo(@SpringQueryMap AppBusHandoverPrepareInfoQuery query); -/* @ApiOperation("修改交车准备 各资料状态修改") + @ApiOperation("发票、合格证确认") @PutMapping("/saveState") @ResponseBody - ResultBean saveState(@RequestBody AppStateDateDto dto);*/ + ResultBean saveState(@RequestBody AppStateDateDto dto); @ApiOperation("交车准备的发票信息") @GetMapping("/getInvoiceInfo") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java index c626bdb602..f898743e84 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java @@ -84,6 +84,11 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign return null; } + @Override + public ResultBean saveState(AppStateDateDto dto) { + return null; + } + /*@Override public ResultBean saveState(AppStateDateDto dto) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/HandoverInformationIntemVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/HandoverInformationIntemVo.java index edbf6867c5..2410ef708f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/HandoverInformationIntemVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/HandoverInformationIntemVo.java @@ -22,4 +22,8 @@ public class HandoverInformationIntemVo { @ApiModelProperty("交接日期") private String recTime; + private String sid; + @ApiModelProperty("确认按钮的展示") + private boolean showBtn; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/HandoverInformationVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/HandoverInformationVo.java index 75552deae6..0e14c66404 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/HandoverInformationVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/HandoverInformationVo.java @@ -23,6 +23,15 @@ public class HandoverInformationVo { @ApiModelProperty("客户名称") private String customerName; @ApiModelProperty("交接记录") - private List itemList = new ArrayList<>(); + private List recordList = new ArrayList<>(); + + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("出库申请创建人的的orgPath") + private String orgPath; + + private String sid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppStateDateDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppStateDateDto.java index 7750cbfe60..057fc647c2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppStateDateDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppStateDateDto.java @@ -10,8 +10,10 @@ public class AppStateDateDto implements Dto { @ApiModelProperty("sid") private String sid; - @ApiModelProperty("车架号") - private String vin; - @ApiModelProperty("状态") + @ApiModelProperty("状态值:01 保存发票接收状态 02合格证接收状态") private String key; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("接收备注") + private String remarks; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java index 03312e77c4..3757930986 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java @@ -115,6 +115,11 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign { return busHandoverPrepareService.getDeliveryPlanInfo(query); } + @Override + public ResultBean saveState(AppStateDateDto dto) { + return busHandoverPrepareService.saveState(dto); + } + /* @Override public ResultBean saveState(AppStateDateDto dto) { return busHandoverPrepareService.saveState(dto); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java index 23cacfa597..86c910d5f6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java @@ -32,7 +32,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; +import com.yxt.anrui.base.api.basevehiclecertificate.CertificateStateQuery; import com.yxt.anrui.base.api.basevehiclecertificate.HandoverCertVo; +import com.yxt.anrui.base.common.enums.CertificState; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum; import com.yxt.anrui.buscenter.api.bushandoverprepare.*; @@ -53,6 +55,7 @@ import com.yxt.anrui.buscenter.biz.busvehicleinformationhandover.BusVehicleInfor import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; +import com.yxt.anrui.fin.api.finvehicleinvoice.StateUpdateQuery; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; @@ -362,6 +365,7 @@ public class BusHandoverPrepareService extends MybatisBaseService resultBean = baseVehicleCertificateFeign.getCertificateInfoOne(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getUseOrgSid()); HandoverCertVo handoverCertVo = resultBean.getData(); BeanUtil.copyProperties(handoverCertVo, vo); + vo.setVinNo(busHandoverPrepareVehicle.getVinNo()); return rb.success().setData(vo); } @@ -432,7 +436,7 @@ public class BusHandoverPrepareService extends MybatisBaseService otherFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType()); otherFiles.removeAll(Collections.singleton(null)); List otherInfo = new ArrayList<>(); - if(!otherFiles.isEmpty()){ + if (!otherFiles.isEmpty()) { for (BuscenterFile file : otherFiles) { otherInfo.add(fileUploadComponent.getUrlPrefix() + file.getFilePath()); } @@ -455,8 +459,8 @@ public class BusHandoverPrepareService extends MybatisBaseService otherInfoList = dto.getOtherInfo(); - if(!otherInfoList.isEmpty()){ - otherInfoList = otherInfoList.stream().map(v->v.replaceAll(fileUploadComponent.getUrlPrefix(),"")).collect(Collectors.toList()); + if (!otherInfoList.isEmpty()) { + otherInfoList = otherInfoList.stream().map(v -> v.replaceAll(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.toList()); buscenterFile.saveAll(dto.getSid(), otherInfoList, BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType()); } return rb.success(); @@ -568,16 +572,20 @@ public class BusHandoverPrepareService extends MybatisBaseService rb = ResultBean.fireFail(); HandoverInformationVo handoverInformationVo = new HandoverInformationVo(); BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(sid); + BusHandoverPrepare busHandoverPrepare = fetchBySid(busHandoverPrepareVehicle.getMainSid()); + handoverInformationVo.setModelSid(busHandoverPrepare.getModelSid()); + handoverInformationVo.setModel(busHandoverPrepare.getModel()); + handoverInformationVo.setConfigSid(busHandoverPrepare.getConfigSid()); + handoverInformationVo.setOrgPath(busHandoverPrepare.getOrgSidPath()); + handoverInformationVo.setCustomerName(busHandoverPrepare.getCustomerName()); + handoverInformationVo.setContractNo(busHandoverPrepare.getContractNo()); + handoverInformationVo.setSid(busHandoverPrepareVehicle.getSid()); BusVehicleInformationHandover busVehicleInformationHandover = busVehicleInformationHandoverService.getVehicleInformationInfo(busHandoverPrepareVehicle.getVinSid()); if (busVehicleInformationHandover != null) { - handoverInformationVo.setContractNo(busVehicleInformationHandover.getContractNo()); - handoverInformationVo.setCustomerName(busVehicleInformationHandover.getCustomerName()); - handoverInformationVo.setVinNo(busVehicleInformationHandover.getVinNo()); - handoverInformationVo.setModel(busVehicleInformationHandover.getModel()); //根据随车资料主表sid查询随车资料的记录 List list = busVehicleInformationService.selectByMainSid(busVehicleInformationHandover.getSid()); list.removeAll(Collections.singleton(null)); - handoverInformationVo.setItemList(list); + handoverInformationVo.setRecordList(list); } return rb.success().setData(handoverInformationVo); } @@ -600,6 +608,53 @@ public class BusHandoverPrepareService extends MybatisBaseService busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getCreateBySid(), BusTransferRecordEnum.FP.getCode()); + if (busTransferRecordsResultBean.getData() != null) { + BusTransferRecords busTransferRecords = busTransferRecordsResultBean.getData(); + busTransferRecords.setReceiveRemarks(dto.getRemarks()); + busTransferRecords.setReceiveTime(new Date()); + busTransferRecordsService.updateById(busTransferRecords); + } + //更新发票的移交状态为已移交 + StateUpdateQuery stateUpdateQuery = new StateUpdateQuery(); + stateUpdateQuery.setVinSid(busHandoverPrepareVehicle.getVinSid()); + stateUpdateQuery.setTransferState(CertificState.TransferState.TRANSTATE_YYJ.getRemarks()); + stateUpdateQuery.setTransferStateKey(CertificState.TransferState.TRANSTATE_YYJ.getCode()); + finVehicleInvoiceFeign.updateYjState(stateUpdateQuery); + + } else if ("02".equals(dto.getKey())) { + //合格证确认：确认接收后，修改合格证的移交状态为已移交。 + busHandoverPrepareVehicle.setCertificateState(1); + //根据车辆sid查询移交记录 + ResultBean busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getCreateBySid(), BusTransferRecordEnum.HGZ.getCode()); + if (busTransferRecordsResultBean.getData() != null) { + BusTransferRecords busTransferRecords = busTransferRecordsResultBean.getData(); + busTransferRecords.setReceiveRemarks(dto.getRemarks()); + busTransferRecords.setReceiveTime(new Date()); + busTransferRecordsService.updateById(busTransferRecords); + } + //修改合格证的移交状态为已移交 + CertificateStateQuery certificateStateQuery = new CertificateStateQuery(); + certificateStateQuery.setVinSid(busHandoverPrepareVehicle.getVinSid()); + certificateStateQuery.setTransferStateKey(CertificState.TransferState.TRANSTATE_YYJ.getCode()); + certificateStateQuery.setTransferStateValue(CertificState.TransferState.TRANSTATE_YYJ.getRemarks()); + baseVehicleCertificateFeign.updateYjState(certificateStateQuery); + } + return rb.success(); } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java index 43cbfe0df1..983cffcfbf 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java @@ -28,7 +28,6 @@ package com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.buscenter.api.bushandoverprepare.app.AppStateDateDto; import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -141,7 +140,7 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService= date_format('" + pagerQuery.getReceiveTimeStart() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(pagerQuery.getReceiveTimeEnd()), "date_format (receiveTime,'%Y-%m-%d') <= date_format('" + pagerQuery.getReceiveTimeEnd() + "','%Y-%m-%d')" diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml index 28a800bc5f..25e7fad3bd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml @@ -21,7 +21,7 @@