|
|
@ -95,6 +95,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami |
|
|
|
@Autowired |
|
|
|
ScmVehinspectItemService scmVehinspectItemService; |
|
|
|
|
|
|
|
|
|
|
|
private QueryWrapper<ScmVehicleExamine> createQueryWrapper(ScmVehicleExamineQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
@ -253,7 +254,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami |
|
|
|
appScmInspectionItemVo.setItem(scmVehinspectItemVo.getItem()); |
|
|
|
appScmInspectionItemVo.setSid(scmVehinspectItemVo.getSid()); |
|
|
|
appScmInspectionItemVo.setResult(scmVehinspectItemVo.getResult()); |
|
|
|
appScmInspectionItemVo.setIconUrl(scmVehinspectItemVo.getIconUrl()); |
|
|
|
appScmInspectionItemVo.setIconUrl(fileUploadComponent.getUrlPrefix() + scmVehinspectItemVo.getIconUrl()); |
|
|
|
inspectionItemVos.add(appScmInspectionItemVo); |
|
|
|
} |
|
|
|
vo.setInspectList(inspectionItemVos); |
|
|
@ -413,13 +414,16 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami |
|
|
|
public ResultBean submitCarInspectedInfo(AppScmVehicleExamineSubmitDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
if (StringUtils.isBlank(dto.getVin())) { |
|
|
|
return rb.setMsg("车架号不能为空"); |
|
|
|
return rb.setMsg("车架号不能为空!"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(dto.getPrice().toString())) { |
|
|
|
return rb.setMsg("洗车费不能为空!"); |
|
|
|
} |
|
|
|
if (dto.getCarInspectedImage().size() <= 0) { |
|
|
|
return rb.setMsg("验车相关照片不能为空"); |
|
|
|
return rb.setMsg("验车相关照片不能为空!"); |
|
|
|
} |
|
|
|
if (dto.getFactoryImage().size() <= 0) { |
|
|
|
return rb.setMsg("厂家验车照片不能为空"); |
|
|
|
return rb.setMsg("厂家验车照片不能为空!"); |
|
|
|
} |
|
|
|
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid(); |
|
|
|
SysStaffinfoVo data = sysUserFeign.getSysUserByMobile(staffSid).getData(); |
|
|
@ -429,68 +433,73 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami |
|
|
|
String type1 = "01"; //厂家验车照片
|
|
|
|
String type2 = "02"; //验车相关照片
|
|
|
|
if (StringUtils.isNotBlank(dto.getInspectedSid())) { |
|
|
|
ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid()); |
|
|
|
if ("1".equals(scmVehicleExamine.getInspectionResult())) { |
|
|
|
scmVehicleExamine.setVinNo(dto.getVin()); |
|
|
|
scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey()); |
|
|
|
scmVehicleExamine.setModelName(dto.getModel()); |
|
|
|
scmVehicleExamine.setConfigName(dto.getConfig()); |
|
|
|
scmVehicleExamine.setRemarks(dto.getRemarks()); |
|
|
|
scmVehicleExamine.setAddress(dto.getAddress()); |
|
|
|
scmVehicleExamine.setAddressCode(dto.getLocation()); |
|
|
|
scmVehicleExamine.setInspectionResult("2"); |
|
|
|
scmVehicleExamine.setPrice(dto.getPrice()); |
|
|
|
scmVehicleExamine.setInspection(data.getName()); |
|
|
|
scmVehicleExamine.setModelDifferenceExplain(dto.getModelDifferenceExplain()); |
|
|
|
scmVehicleExamine.setGuaranteeCardNo(dto.getGuaranteeCardNo()); |
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
String inspectionDate = simpleDateFormat.format(new Date()); |
|
|
|
scmVehicleExamine.setInspectionDate(inspectionDate); |
|
|
|
baseMapper.updateById(scmVehicleExamine); |
|
|
|
// 通过验车 并保存入库单
|
|
|
|
AppScmVehicleEnterlibraryCarWarehousingDto carWarehousingDto = new AppScmVehicleEnterlibraryCarWarehousingDto(); |
|
|
|
carWarehousingDto.setVinNo(scmVehicleExamine.getVinNo()); |
|
|
|
carWarehousingDto.setPurchaseType(scmVehicleExamine.getPurchaseType()); |
|
|
|
carWarehousingDto.setPurchaseTypeKey(scmVehicleExamine.getPurchaseTypeKey()); |
|
|
|
carWarehousingDto.setModelName(scmVehicleExamine.getModelName()); |
|
|
|
carWarehousingDto.setDepartureDate(scmVehicleExamine.getDepartureDate()); |
|
|
|
carWarehousingDto.setInspectionDate(scmVehicleExamine.getInspectionDate()); |
|
|
|
carWarehousingDto.setInspection(scmVehicleExamine.getInspection()); |
|
|
|
carWarehousingDto.setInboundState("1"); |
|
|
|
carWarehousingDto.setUseOrgSid(data1.getSid()); |
|
|
|
carWarehousingDto.setUseOrgName(data1.getName()); |
|
|
|
scmVehicleEnterlibraryService.saveCarWarehousing(carWarehousingDto); |
|
|
|
|
|
|
|
scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type1); |
|
|
|
List<String> factoryImage = dto.getFactoryImage(); |
|
|
|
for (String s : factoryImage) { |
|
|
|
if (s.contains(fileUploadComponent.getUrlPrefix())) { |
|
|
|
s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
Boolean aBoolean = scmVehinspectItemService.selByTrueAndFalse(dto.getInspectedSid()); |
|
|
|
if (aBoolean) { |
|
|
|
ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid()); |
|
|
|
if ("1".equals(scmVehicleExamine.getInspectionResult())) { |
|
|
|
scmVehicleExamine.setVinNo(dto.getVin()); |
|
|
|
scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey()); |
|
|
|
scmVehicleExamine.setModelName(dto.getModel()); |
|
|
|
scmVehicleExamine.setConfigName(dto.getConfig()); |
|
|
|
scmVehicleExamine.setRemarks(dto.getRemarks()); |
|
|
|
scmVehicleExamine.setAddress(dto.getAddress()); |
|
|
|
scmVehicleExamine.setAddressCode(dto.getLocation()); |
|
|
|
scmVehicleExamine.setInspectionResult("2"); |
|
|
|
scmVehicleExamine.setPrice(dto.getPrice()); |
|
|
|
scmVehicleExamine.setInspection(data.getName()); |
|
|
|
scmVehicleExamine.setModelDifferenceExplain(dto.getModelDifferenceExplain()); |
|
|
|
scmVehicleExamine.setGuaranteeCardNo(dto.getGuaranteeCardNo()); |
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
String inspectionDate = simpleDateFormat.format(new Date()); |
|
|
|
scmVehicleExamine.setInspectionDate(inspectionDate); |
|
|
|
baseMapper.updateById(scmVehicleExamine); |
|
|
|
// 通过验车 并保存入库单
|
|
|
|
AppScmVehicleEnterlibraryCarWarehousingDto carWarehousingDto = new AppScmVehicleEnterlibraryCarWarehousingDto(); |
|
|
|
carWarehousingDto.setVinNo(scmVehicleExamine.getVinNo()); |
|
|
|
carWarehousingDto.setPurchaseType(scmVehicleExamine.getPurchaseType()); |
|
|
|
carWarehousingDto.setPurchaseTypeKey(scmVehicleExamine.getPurchaseTypeKey()); |
|
|
|
carWarehousingDto.setModelName(scmVehicleExamine.getModelName()); |
|
|
|
carWarehousingDto.setDepartureDate(scmVehicleExamine.getDepartureDate()); |
|
|
|
carWarehousingDto.setInspectionDate(scmVehicleExamine.getInspectionDate()); |
|
|
|
carWarehousingDto.setInspection(scmVehicleExamine.getInspection()); |
|
|
|
carWarehousingDto.setInboundState("1"); |
|
|
|
carWarehousingDto.setUseOrgSid(data1.getSid()); |
|
|
|
carWarehousingDto.setUseOrgName(data1.getName()); |
|
|
|
scmVehicleEnterlibraryService.saveCarWarehousing(carWarehousingDto); |
|
|
|
|
|
|
|
scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type1); |
|
|
|
List<String> factoryImage = dto.getFactoryImage(); |
|
|
|
for (String s : factoryImage) { |
|
|
|
if (s.contains(fileUploadComponent.getUrlPrefix())) { |
|
|
|
s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
ScmFile scmFile1 = new ScmFile(); |
|
|
|
scmFile1.setAttachType("01"); |
|
|
|
scmFile1.setFileName("厂家验车照片"); |
|
|
|
scmFile1.setFilePath(s1); |
|
|
|
scmFile1.setLinkSid(dto.getInspectedSid()); |
|
|
|
scmFileService.save(scmFile1); |
|
|
|
} |
|
|
|
ScmFile scmFile1 = new ScmFile(); |
|
|
|
scmFile1.setAttachType("01"); |
|
|
|
scmFile1.setFileName("厂家验车照片"); |
|
|
|
scmFile1.setFilePath(s1); |
|
|
|
scmFile1.setLinkSid(dto.getInspectedSid()); |
|
|
|
scmFileService.save(scmFile1); |
|
|
|
} |
|
|
|
scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type2); |
|
|
|
List<String> carInspectedImage = dto.getCarInspectedImage(); |
|
|
|
for (String s : carInspectedImage) { |
|
|
|
if (s.contains(fileUploadComponent.getUrlPrefix())) { |
|
|
|
s2 = s.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
scmFileService.deleteByLinkSidAndType(scmVehicleExamine.getSid(), type2); |
|
|
|
List<String> carInspectedImage = dto.getCarInspectedImage(); |
|
|
|
for (String s : carInspectedImage) { |
|
|
|
if (s.contains(fileUploadComponent.getUrlPrefix())) { |
|
|
|
s2 = s.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
ScmFile scmFile2 = new ScmFile(); |
|
|
|
scmFile2.setAttachType("02"); |
|
|
|
scmFile2.setFileName("验车相关照片"); |
|
|
|
scmFile2.setFilePath(s2); |
|
|
|
scmFile2.setLinkSid(dto.getInspectedSid()); |
|
|
|
scmFileService.save(scmFile2); |
|
|
|
} |
|
|
|
ScmFile scmFile2 = new ScmFile(); |
|
|
|
scmFile2.setAttachType("02"); |
|
|
|
scmFile2.setFileName("验车相关照片"); |
|
|
|
scmFile2.setFilePath(s2); |
|
|
|
scmFile2.setLinkSid(dto.getInspectedSid()); |
|
|
|
scmFileService.save(scmFile2); |
|
|
|
} |
|
|
|
return rb.success().setMsg("操作成功!"); |
|
|
|
return rb.success().setMsg("操作成功!"); |
|
|
|
|
|
|
|
} else if ("2".equals(scmVehicleExamine.getInspectionResult())) { |
|
|
|
return rb.fail().setMsg("当前车辆已验车完成,请勿重复提交"); |
|
|
|
} else if ("2".equals(scmVehicleExamine.getInspectionResult())) { |
|
|
|
return rb.fail().setMsg("当前车辆已验车完成,请勿重复提交"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
return rb.fail().setMsg("车辆检查表项目必须全部通过!"); |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.fail().setMsg("操作失败!"); |
|
|
|