diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index a4dbc73f93..dc91e469b9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -180,9 +180,9 @@ public class ScmApplyInboundService extends MybatisBaseService scmFiles = dto.getScmFiles(); // 验证车架号:不能为空、不能重复 - List vehicleList1 = dto.getVehicleList(); + /*List vehicleList1 = dto.getVehicleList(); List vinNoList1 = vehicleList1.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList()); - /*if (vehicleList.size() != vinNoList.size()) { + if (vehicleList.size() != vinNoList.size()) { return new ResultBean().fail().setMsg("车架号不能为空"); }*/ // 去重 @@ -190,16 +190,6 @@ public class ScmApplyInboundService extends MybatisBaseService scmApplyInboundVehicles = scmApplyInboundVehicleService.listAll(scmApplyInboundVehicleQuery); - if (scmApplyInboundVehicles.size() > 0){ - return rb.setMsg("车架号" + s + "已存在入库申请中,请重新填写"); - } - } - - if (StringUtils.isBlank(dto.getSid())) { // 新增 // 验证数据库是否重复 /* for (int i = 0; i < vinNoList.size(); i++) { @@ -263,7 +253,7 @@ public class ScmApplyInboundService extends MybatisBaseService selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - int checkVinNo(@Param("vinNo") String vinNo, @Param("applySid") String applySid); + int checkVinNo(@Param("vinNo") String vinNo); List selectListByAppSid(@Param("applySid") String applySid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.xml index d1a4f45c52..64c3394345 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehicle/ScmApplyInboundVehicleMapper.xml @@ -9,9 +9,6 @@