Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionInfoVo.java

@@ -108,6 +108,7 @@ public class AppScmVehicleGressionInfoVo implements Vo {
     private String personUserSid;
     @ApiModelProperty("车架号")
     private List<ScmVehicleGressionVehVo> scmVehicleGressionVehs = new ArrayList<>();
+    private String createBySid;
 
   /*  @ApiModelProperty("车辆sid")
     private String vehicleSid;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -369,9 +369,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
     public ResultBean<String> saveCarTransferInfo(AppScmVehicleGressionDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         List<ScmVehicleGressionVehDto> scmVehicleGressionVehDtos = dto.getScmVehicleGressionVehs();
-        if (scmVehicleGressionVehDtos == null) {
-            return rb.setMsg("请选择车架号！");
-        }
         if (dto.getLocationSid().equals(dto.getTargetLocationSid())) {
             return rb.setMsg("目标存放地点不能与现存放地点重复！");
         }
@@ -450,6 +447,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
         }
         vo.setImage(image);
+        vo.setUserSid(vo.getCreateBySid());
         return rb.success().setData(vo);
 
        /* String type1 = "04"; //保单照片
@@ -654,6 +652,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      */
     public ResultBean submitCarTransfer(SubmitCarTransferDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        List<ScmVehicleGressionVehDto> scmVehicleGressionVehDtos1 = dto.getScmVehicleGressionVehs();
+        if (scmVehicleGressionVehDtos1.size() == 0) {
+            return rb.setMsg("请选择车架号！");
+        }
         //根据用户sid获取staffSid
         ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
         if (!userVoResultBean.getSuccess()) {