diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index 05f639215f..c59556550e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -247,15 +247,7 @@ public class ScmVehicleReturnService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); - UpdateFlowFieldVo ufVo = voResultBean.getData(); - updateFlowFiled(BeanUtil.beanToMap(ufVo));*/ //极光推送 ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); @@ -297,15 +289,15 @@ public class ScmVehicleReturnService extends MybatisBaseService resultBean1 = flowableFeign.startProcess(bv); UpdateFlowFieldVo uff = resultBean1.getData(); updateFlowFiled(BeanUtil.beanToMap(uff)); - BaseVehicleUpdateQuery baseVehicleUpdateQuery = new BaseVehicleUpdateQuery(); - List strings = new ArrayList<>(); + List baseVehicleDtos = new ArrayList<>(); for (ScmVehicleReturnDetailsDto scmVehicleReturnDetailsDto : detailsList) { - strings.add(scmVehicleReturnDetailsDto.getVinNo()); + BaseVehicleDto baseVehicleDto = new BaseVehicleDto(); + baseVehicleDto.setVinNo(scmVehicleReturnDetailsDto.getVinNo()); + baseVehicleDto.setVehicleState(VehicleState.StockEnum.RETURNING_STOCK.getCode()); + baseVehicleDto.setVehicleStateValue(VehicleState.StockEnum.RETURNING_STOCK.getRemarks()); + baseVehicleDtos.add(baseVehicleDto); } - baseVehicleUpdateQuery.setVinNoLis(strings); - baseVehicleUpdateQuery.setVehicleState("0003"); - baseVehicleUpdateQuery.setVihicleStateValue("采购退库中"); - baseVehicleFeign.updateByVinNo(baseVehicleUpdateQuery); + baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.UPDATE_VEHICLE.getCode()); //极光推送 ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid); MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();