Merge remote-tracking branch 'origin/master' into master

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<ScmVehicleReturn
                 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());
-
-            /*ResultBean<UpdateFlowFieldVo> 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<ScmVehicleReturn
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo uff = resultBean1.getData();
             updateFlowFiled(BeanUtil.beanToMap(uff));
-            BaseVehicleUpdateQuery baseVehicleUpdateQuery = new BaseVehicleUpdateQuery();
-            List<String> strings = new ArrayList<>();
+            List<BaseVehicleDto> 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();