diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbStoragevehicletype.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbStoragevehicletype.java index 8725530..8279f5d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbStoragevehicletype.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbStoragevehicletype.java @@ -24,7 +24,7 @@ public class MdPbStoragevehicletype { private String storagevehicle_btype; private String storagevehicle_size; /** - * 1.RT16 2.PS20 3.RT16和PS20 + * 1.RT16(3层) 2.PS20(四层) 3.RT16和PS20 */ private String suitable_car; private String storagevehicle_name; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicletypeServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicletypeServiceImpl.java index abd8a32..2d06099 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicletypeServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicletypeServiceImpl.java @@ -11,17 +11,23 @@ import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicletype; import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicletypeMapper; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class MdPbStoragevehicletypeServiceImpl extends ServiceImpl implements IMdPbStoragevehicletypeService { @Override public MdPbStoragevehicletype getByCode(String storagevehicle_stype) { - MdPbStoragevehicletype one = this.getOne( + List list = this.list( new QueryWrapper().lambda() - .eq(MdPbStoragevehicletype::getStoragevehicle_stype, storagevehicle_stype) - ); - if (ObjectUtil.isEmpty(one)) { + .and(wrapper -> wrapper + .eq(MdPbStoragevehicletype::getStoragevehicle_stype, storagevehicle_stype) + .or() + .eq(MdPbStoragevehicletype::getStoragevehicle_btype, storagevehicle_stype) + )); + if (ObjectUtil.isEmpty(list)) { throw new BadRequestException("载具类型为【"+storagevehicle_stype+"】的不存在!"); } - return one; + return list.get(0); } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseRegionServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseRegionServiceImpl.java index 5d816bf..c1571a7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseRegionServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseRegionServiceImpl.java @@ -82,6 +82,11 @@ public class SchBaseRegionServiceImpl extends ServiceImpl getRegionList(SchBaseRegion region) { return schBaseRegionMapper.selectList(new LambdaQueryWrapper()