From d0d7dac83ac53f037dc970a225d9887f0ca2f035 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 7 Feb 2026 18:23:57 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedriver/robot_arm/RobotArmDeviceDriver.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/robot_arm/RobotArmDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/robot_arm/RobotArmDeviceDriver.java index 9d613f4..2b2185d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/robot_arm/RobotArmDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/robot_arm/RobotArmDeviceDriver.java @@ -158,6 +158,7 @@ public class RobotArmDeviceDriver extends AbstractOpcDeviceDriver implements Dev */ public void executeTask() { String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); + String hasHk = paramService.findByCode(AcsConfig.HAS_HK).getValue(); JSONObject param = new JSONObject(); // 申请叫料任务 @@ -168,7 +169,7 @@ public class RobotArmDeviceDriver extends AbstractOpcDeviceDriver implements Dev .eq(Task::getIs_delete, "0") .in(Task::getTask_status, "0", "1") ); - if (ObjectUtil.isEmpty(list) && "1".equals(hasWms)) { + if (ObjectUtil.isEmpty(list) && "1".equals(hasWms) && "1".equals(hasHk)) { // 调用上位接口 param.put("device_code", devicecode); param.put("type", "2"); @@ -190,7 +191,7 @@ public class RobotArmDeviceDriver extends AbstractOpcDeviceDriver implements Dev .eq(Task::getIs_delete, "0") .in(Task::getTask_status, "0", "1") ); - if (ObjectUtil.isEmpty(list) && "1".equals(hasWms)) { + if (ObjectUtil.isEmpty(list) && "1".equals(hasWms) && "1".equals(hasHk)) { // 调用上位接口 param.put("device_code", devicecode); param.put("type", "2");