diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleGression.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleGression.java index 0fcb72e1d7..a4da9d90df 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleGression.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VehicleGression.java @@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data public class VehicleGression implements Dto { @@ -11,7 +13,7 @@ public class VehicleGression implements Dto { private static final long serialVersionUID = -8486627972024814008L; @ApiModelProperty("车架号") - private String vin; + private List vin; @ApiModelProperty("存放地点sid") private String location; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 9ce0eb7376..ee8e1b4cef 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -1428,8 +1428,8 @@ public class BaseVehicleService extends MybatisBaseService vin = vehicleGression.getVin(); + for (String s : vin) { + baseMapper.updateVehicleGressionByVin(s, vehicleGression.getLocation(), vehicleGression.getLocationName()); + } return rb.success(); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java index 3fca37aa9f..7813300e80 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleCarTransferSiteImageDto.java @@ -18,6 +18,12 @@ public class AppScmVehicleCarTransferSiteImageDto implements Dto { @ApiModelProperty("保存车辆移库现场照片") private List images; + @ApiModelProperty("保单照片") + private String policyImages; + + @ApiModelProperty("临牌") + private String proCard; + @ApiModelProperty("地址") private String address; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java index d53d721137..97b9927b07 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDetailsVo.java @@ -106,6 +106,12 @@ public class AppScmVehicleGressionDetailsVo implements Vo { @ApiModelProperty("经纬度") private String locationCode; + @ApiModelProperty("显示保单照片") + private boolean insuranceShow; + + @ApiModelProperty("显示临牌文本框") + private boolean proCardShow; + @ApiModelProperty("任务id") private String taskId; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java index a4df1add39..8d1ff90541 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageVo.java @@ -52,6 +52,8 @@ public class AppScmVehicleGressionPageVo implements Vo { private String sid; @ApiModelProperty("车架号") private String vin; + @ApiModelProperty("车数量") + private String vinNum; @ApiModelProperty("申请编号") private String applyId; @ApiModelProperty("审核状态") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java index f9b6fa0ce9..98b625c3d7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java @@ -212,7 +212,7 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign { @Override public ResultBean getErtraState(String sid, String userSid) { - return scmVehicleGressionService.getErtraState(sid,userSid); + return scmVehicleGressionService.getErtraState(sid, userSid); } @Override diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index a1546cb1f5..a3bd631325 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -264,6 +264,8 @@ public class ScmVehicleGressionService extends MybatisBaseService vins = scmVehicleGressionVehService.fetchVoByMainSid(record.getSid()); + int size = vins.size(); + record.setVinNum(String.valueOf(size)); String vin = StringUtils.join(vins, ","); record.setVin(vin); @@ -395,28 +397,42 @@ public class ScmVehicleGressionService extends MybatisBaseService factoryImage = dto.getPolicyImage(); - if (factoryImage.size() <= 0) { - return rb.setMsg("保单照片不能为空"); - } - scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type); - for (String s : factoryImage) { - if (s.contains(fileUploadComponent.getUrlPrefix())) { - s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); - } - ScmFile scmFile = new ScmFile(); - scmFile.setAttachType(type); - scmFile.setFileName("保单照片"); - scmFile.setFilePath(s1); - scmFile.setLinkSid(scmVehicleGression.getSid()); - scmFileService.save(scmFile); +// if ("1".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片 +// List factoryImage = dto.getPolicyImage(); +// if (factoryImage.size() <= 0) { +// return rb.setMsg("保单照片不能为空"); +// } +// scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type); +// for (String s : factoryImage) { +// if (s.contains(fileUploadComponent.getUrlPrefix())) { +// s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); +// } +// ScmFile scmFile = new ScmFile(); +// scmFile.setAttachType(type); +// scmFile.setFileName("保单照片"); +// scmFile.setFilePath(s1); +// scmFile.setLinkSid(scmVehicleGression.getSid()); +// scmFileService.save(scmFile); +// } +// } else if ("0".equals(dto.getInsuranceStateKey())) { +// scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type); +// } + updateById(scmVehicleGression); + scmVehicleGressionVehService.deleteByMainSid(scmVehicleGression.getSid()); + List vins = dto.getVins(); + if (vins != null) { + for (String vin : vins) { + ScmVehicleGressionVeh scmVehicleGressionVeh = new ScmVehicleGressionVeh(); + scmVehicleGressionVeh.setMainSid(scmVehicleGression.getSid()); + scmVehicleGressionVeh.setVehVin(vin); + BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vin).getData(); + scmVehicleGressionVeh.setVehSid(baseVehicleVo.getSid()); + scmVehicleGressionVeh.setSettlementStatus(baseVehicleVo.getSettlementStatus()); + scmVehicleGressionVeh.setSettlementStatusValue(baseVehicleVo.getSettlementStatusValue()); + scmVehicleGressionVeh.setTemporaryCardNo(dto.getTemporaryCard()); + scmVehicleGressionVehService.save(scmVehicleGressionVeh); } - } else if ("0".equals(dto.getInsuranceStateKey())) { - scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type); } - updateById(scmVehicleGression); - } return rb.success().setData(scmVehicleGression.getSid()).setMsg("保存成功"); } @@ -468,6 +484,12 @@ public class ScmVehicleGressionService extends MybatisBaseService policyImage = new ArrayList<>(); List image = new ArrayList<>(); AppScmVehicleGressionDetailsVo vo = baseMapper.getCarTransfer(sid); + if ("1".equals(vo.getInsuranceStateKey())) { + vo.setInsuranceShow(true); + } + if ("1".equals(vo.getProCardStateKey())) { + vo.setProCardShow(true); + } List vins = scmVehicleGressionVehService.fetchVoByMainSid(sid); String vin = StringUtils.join(vins, StringUtils.LF); vo.setVinNo(vin); @@ -525,19 +547,32 @@ public class ScmVehicleGressionService extends MybatisBaseService images = dto.getImages(); if (images.size() > 0) { for (String s : images) { if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); + s2 = s.replace(fileUploadComponent.getUrlPrefix(), ""); } ScmFile scmFile = new ScmFile(); - scmFile.setAttachType(type); + scmFile.setAttachType(type2); scmFile.setFileName("车辆移库现场照片"); - scmFile.setFilePath(s1); + scmFile.setFilePath(s2); scmFile.setLinkSid(dto.getSid()); scmFileService.save(scmFile); } @@ -545,6 +580,7 @@ public class ScmVehicleGressionService extends MybatisBaseService list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid()); + vehicleGression.setVin(list); vehicleGression.setLocation(scmVehicleGression.getTargetLocationSid()); vehicleGression.setLocationName(scmVehicleGression.getTargetLocation()); baseVehicleFeign.updateVehicleGressionByVin(vehicleGression); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java index 76b5d9a0fa..a98f555755 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java @@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVeh; import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehDetailsVo; import com.yxt.anrui.scm.api.scmvehiclegressionveh.ScmVehicleGressionVehVo; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -68,4 +69,7 @@ public interface ScmVehicleGressionVehMapper extends BaseMapper fetchVoByMainSid(@Param("mainSid") String mainSid); + + @Delete("delete from scm_vehicle_gression_veh where mainSid =#{sid}") + void deleteByMainSid(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java index 69adb6a5f2..bc84d11204 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java @@ -113,4 +113,8 @@ public class ScmVehicleGressionVehService extends MybatisBaseService images; + @ApiModelProperty("保单照片") + private String policyImages; + + @ApiModelProperty("临牌") + private String proCard; + @ApiModelProperty("地址") private String address; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java index a16ebccb45..49146cafdc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java @@ -84,9 +84,21 @@ public class AppGressionDetailsVo implements Vo { @ApiModelProperty("保险状态") private String InsuranceStateKey; + @ApiModelProperty("临牌状态") + private String proCardState; + + @ApiModelProperty("临牌状态") + private String proCardStateKey; + @ApiModelProperty("保单照片") private List policyImage; + @ApiModelProperty("显示保单照片") + private boolean insuranceShow; + + @ApiModelProperty("显示临牌文本框") + private boolean proCardShow; + @ApiModelProperty("地址") private String address; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java index 87dc8f2cf5..e9749fb8f5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java @@ -85,6 +85,12 @@ public class AppGressionInfoVo implements Vo { @JsonProperty("insuranceStateKey") private String InsuranceStateKey; + @ApiModelProperty("临牌状态") + private String proCardState; + + @ApiModelProperty("临牌状态") + private String proCardStateKey; + @ApiModelProperty("保单照片") private List policyImage; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageVo.java index 176d03bbc3..a610fc64c9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageVo.java @@ -12,6 +12,8 @@ public class AppGressionPageVo implements Vo { private String sid; @ApiModelProperty("车架号") private String vin; + @ApiModelProperty("车数量") + private String vinNum; @ApiModelProperty("申请编号") private String applyId; @ApiModelProperty("状态") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java index 230292fa4c..10d4329d17 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java @@ -140,11 +140,11 @@ public class AppScmVehicleGressionService { ResultBean rb = ResultBean.fireFail(); SubmitCarTransferDto submitCarTransferDto = new SubmitCarTransferDto(); BeanUtil.copyProperties(dto, submitCarTransferDto); - //根据车架号查询车辆sid - ResultBean stringResultBean = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()); - if (stringResultBean.getSuccess()) { - submitCarTransferDto.setVehicleSid(stringResultBean.getData().getSid()); - } +// //根据车架号查询车辆sid +// ResultBean stringResultBean = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()); +// if (stringResultBean.getSuccess()) { +// submitCarTransferDto.setVehicleSid(stringResultBean.getData().getSid()); +// } ResultBean resultBean = scmVehicleGressionFeign.submitCarTransfer(submitCarTransferDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg());