外采退库 修改

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@@ -327,15 +327,16 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
                 updateQuery.setVihicleStateValue("采购退库中");
                 baseVehicleFeign.updateByVinNo(updateQuery);*/
                 //生成采购退库办理
+                ResultBean<SysUserVo> sysUserResultBean = sysUserFeign.fetchBySid(booad.getCreateBySid());
                 BaseManufacturerRetwareDto brd=new BaseManufacturerRetwareDto();
                 brd.setSource("采购退库"); // 来源
-                brd.setOperatorName(booad.getName()); // 操作人姓名
+                brd.setOperatorName(sysUserResultBean.getData().getName()); // 操作人姓名
                 brd.setCreateBySid(booad.getCreateBySid());
                 brd.setApplyName(booad.getName()); // 申请人姓名
                 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
                 brd.setAppluDate(sdf.format(booad.getCreateTime())); // 申请日期
                 brd.setNum(detailsList.size()+""); // 车辆台数
-                ResultBean<SysUserVo> sysUserResultBean = sysUserFeign.fetchBySid(booad.getCreateBySid());
+
                 ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(sysUserResultBean.getData().getStaffSid());
                 brd.setCreateOrgSid(stringResultBean.getData()); // 创建组织sid
                 List<BaseManufacturerRetwareVehDto> baseManufacturerRetwareVehs=new ArrayList<>();
@@ -346,6 +347,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
                     baseManufacturerRetwareVehs.add(baseManufacturerRetwareVehDto);
                 }
                 brd.setBaseManufacturerRetwareVehs(baseManufacturerRetwareVehs);//aseManufacturerRetwareVehs;
+                brd.setApplyName(sysUserResultBean.getData().getName());
                 baseManufacturerRetwareFeign.save(brd);
             }
             return rb1;