diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 3bc0a79..a86ab9d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -430,14 +430,14 @@ public class InstructionServiceImpl extends CommonServiceImpl(Structattr.class) + List list = iStructattrService.list(new LambdaQueryWrapper<>(Structattr.class) .eq(Structattr::getSect_code, IOSConstant.SECT_CODE) .eq(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) .eq(Structattr::getIs_emptyvehicle, IOSConstant.IS_DELETE_YES) @@ -185,6 +185,9 @@ public class PdaEmpVehicleServiceImpl implements PdaEmpVehicleService { Structattr::getStoragevehicle_type, IOSEnum.VEHICLE_TYPE_PUT.code("大料架(长边)")) .orderByAsc(Structattr::getStruct_code) ); - return attrDao; + if (ObjectUtil.isEmpty(list)) { + throw new BadRequestException("库内此类型空托盘不足!【" + whereJson.getString("storagevehicle_type") + "】"); + } + return list.get(0); } }