diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java index 539c53092..96fdb303d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java @@ -483,10 +483,16 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice list.add(map10); } if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsBinding())) { - map10.put("code", "to_material"); - map10.put("value", interactionJsonDTO.getBarcode()); + map11.put("code", "to_material"); + map11.put("value", interactionJsonDTO.getBarcode()); list.add(map11); } + Map map12 = new HashMap<>(); + if (ObjectUtil.isNotEmpty(interactionJsonDTO.getBindingTimes())) { + map12.put("code", "to_binding_times"); + map12.put("value", interactionJsonDTO.getBindingTimes()); + list.add(map12); + } } this.writing(list); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java index 604d61376..e6b3e4714 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java @@ -1,5 +1,6 @@ package org.nl.acs.utils; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -46,7 +47,7 @@ public class ReadUtil { // 连接信息 ConnectionInformation ci = new ConnectionInformation(); ci.setHost(opc.getOpc_host()); - ci.setDomain(opc.getDomain()); + ci.setDomain(StrUtil.isEmpty(opc.getDomain()) ? " " : opc.getDomain()); ci.setUser(opc.getUser()); ci.setPassword(opc.getPassword()); ci.setClsid(opc.getCls_id());