diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/B2HandServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/B2HandServiceImpl.java index 1d43340c5..2b97438f6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/B2HandServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/B2HandServiceImpl.java @@ -167,12 +167,12 @@ public class B2HandServiceImpl implements B2HandService { json.put("message", "操作不能为空"); errArr.add(json); } - if (device_code.contains("K")&&(!"1".equals(option))){ - throw new BadRequestException("该设备为空轴位,不能进行该操作"); - } - if (device_code.contains("M")&&(!"2".equals(option))){ + if (device_code.contains("M")&&(!"1".equals(option))){ throw new BadRequestException("该设备为满轴位,不能进行该操作"); } + if (device_code.contains("K")&&(!"2".equals(option))){ + throw new BadRequestException("该设备为空轴位,不能进行该操作"); + } StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; Device device = deviceAppService.findDeviceByCode(device_code); standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();