From abf7964c96a201e78e3fb09ced72e52a05a5f233 Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Tue, 16 Apr 2024 11:10:30 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=89=8B?=
 =?UTF-8?q?=E6=8C=81=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/hand/service/impl/B2HandServiceImpl.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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();