|
|
|
@ -1572,49 +1572,53 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
|
|
|
|
|
}
|
|
|
|
|
// 送货车号
|
|
|
|
|
if (model.getVehicleId() != null) {
|
|
|
|
|
LambdaQueryWrapper<VehicleEntity> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
wrapper.eq(VehicleEntity::getTicketno, model.getVehicleId());
|
|
|
|
|
if (!String.valueOf(model.getDriverName()).equals("null")){
|
|
|
|
|
wrapper.eq(VehicleEntity::getDrivername,model.getDriverName());
|
|
|
|
|
}
|
|
|
|
|
if (model.getDriverVehicleId()==null||model.getVehicleId().equals(model.getDriverVehicleId())){
|
|
|
|
|
LambdaQueryWrapper<VehicleEntity> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
wrapper.eq(VehicleEntity::getTicketno, model.getVehicleId());
|
|
|
|
|
if (!String.valueOf(model.getDriverName()).equals("null")){
|
|
|
|
|
wrapper.eq(VehicleEntity::getDrivername,model.getDriverName());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<VehicleEntity> vehicleEntityList = vehicleMapper.selectList(wrapper);
|
|
|
|
|
if (vehicleEntityList != null && vehicleEntityList.size() > 0) {
|
|
|
|
|
model.setVehicleId(vehicleEntityList.get(0).getId());
|
|
|
|
|
VehicleEntity vehicleEntity = vehicleEntityList.get(0);
|
|
|
|
|
List<VehicleEntity> vehicleEntityList = vehicleMapper.selectList(wrapper);
|
|
|
|
|
if (vehicleEntityList != null && vehicleEntityList.size() > 0) {
|
|
|
|
|
model.setVehicleId(vehicleEntityList.get(0).getId());
|
|
|
|
|
VehicleEntity vehicleEntity = vehicleEntityList.get(0);
|
|
|
|
|
// 车辆照片
|
|
|
|
|
vehicleEntity.setVehiclephotos(model.getCarPictures());
|
|
|
|
|
vehicleEntity.setVehiclephotos(model.getCarPictures());
|
|
|
|
|
// 联系信息
|
|
|
|
|
if (!String.valueOf(model.getContact()).equals("null")&&!model.getContact().isEmpty()) {
|
|
|
|
|
vehicleEntity.setContact(model.getContact());
|
|
|
|
|
}
|
|
|
|
|
vehicleMapper.updateById(vehicleEntity);
|
|
|
|
|
} else {
|
|
|
|
|
if (!String.valueOf(model.getContact()).equals("null")&&!model.getContact().isEmpty()) {
|
|
|
|
|
vehicleEntity.setContact(model.getContact());
|
|
|
|
|
}
|
|
|
|
|
vehicleMapper.updateById(vehicleEntity);
|
|
|
|
|
} else {
|
|
|
|
|
// 添加车牌号
|
|
|
|
|
// id
|
|
|
|
|
Long aLong = new DefaultIdentifierGenerator().nextId(VehicleEntity.class);
|
|
|
|
|
VehicleEntity vehicleEntity = new VehicleEntity();
|
|
|
|
|
vehicleEntity.setId(aLong.toString());
|
|
|
|
|
Long aLong = new DefaultIdentifierGenerator().nextId(VehicleEntity.class);
|
|
|
|
|
VehicleEntity vehicleEntity = new VehicleEntity();
|
|
|
|
|
vehicleEntity.setId(aLong.toString());
|
|
|
|
|
// 车辆照片
|
|
|
|
|
vehicleEntity.setVehiclephotos(model.getCarPictures());
|
|
|
|
|
vehicleEntity.setVehiclephotos(model.getCarPictures());
|
|
|
|
|
// 车牌号
|
|
|
|
|
vehicleEntity.setTicketno(model.getVehicleId());
|
|
|
|
|
vehicleEntity.setTicketno(model.getVehicleId());
|
|
|
|
|
// 联系方式
|
|
|
|
|
if (!String.valueOf(model.getContact()).equals("null")&&!model.getContact().isEmpty()){
|
|
|
|
|
vehicleEntity.setContact(model.getContact());
|
|
|
|
|
}
|
|
|
|
|
if (!String.valueOf(model.getContact()).equals("null")&&!model.getContact().isEmpty()){
|
|
|
|
|
vehicleEntity.setContact(model.getContact());
|
|
|
|
|
}
|
|
|
|
|
// 司机名称
|
|
|
|
|
if (!String.valueOf(model.getDriverName()).equals("null")&&!model.getDriverName().isEmpty()){
|
|
|
|
|
if (!String.valueOf(model.getDriverName()).equals("null")&&!model.getDriverName().isEmpty()){
|
|
|
|
|
|
|
|
|
|
vehicleEntity.setDrivername(model.getDriverName());
|
|
|
|
|
}
|
|
|
|
|
vehicleMapper.insert(vehicleEntity);
|
|
|
|
|
model.setVehicleId(aLong.toString());
|
|
|
|
|
// model.setCauseError("车牌号不存在!请添加车辆信息在尝试添加!");
|
|
|
|
|
// errList.add(model);
|
|
|
|
|
// ints.add(i);
|
|
|
|
|
// continue;
|
|
|
|
|
vehicleEntity.setDrivername(model.getDriverName());
|
|
|
|
|
}
|
|
|
|
|
vehicleMapper.insert(vehicleEntity);
|
|
|
|
|
model.setVehicleId(aLong.toString());
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
model.setCauseError("目录名称的车牌号对应不上表格中的,请检查!excel中的车牌号为:"+model.getVehicleId()+",目录中车牌号为:"+model.getDriverVehicleId());
|
|
|
|
|
errList.add(model);
|
|
|
|
|
ints.add(i);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
if (model.getDriverVehicleId()!=null){
|
|
|
|
|
model.setVehicleId(model.getDriverVehicleId());
|
|
|
|
|