root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt: 叠盘行架优化

Browse Source
This commit is contained in:
yanps
2024-04-17 10:54:39 +08:00
parent 25ceba641b
commit face884aee
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java
View File

@@ -483,10 +483,16 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
list.add(map10); list.add(map10);
} }
if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsBinding())) { if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsBinding())) {
map10.put("code", "to_material"); map11.put("code", "to_material");
map10.put("value", interactionJsonDTO.getBarcode()); map11.put("value", interactionJsonDTO.getBarcode());
list.add(map11); list.add(map11);
} }
Map<String, Object> 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); this.writing(list);

3
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java
View File

@@ -1,5 +1,6 @@
package org.nl.acs.utils; package org.nl.acs.utils;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@@ -46,7 +47,7 @@ public class ReadUtil {
// 连接信息 // 连接信息
ConnectionInformation ci = new ConnectionInformation(); ConnectionInformation ci = new ConnectionInformation();
ci.setHost(opc.getOpc_host()); ci.setHost(opc.getOpc_host());
ci.setDomain(opc.getDomain()); ci.setDomain(StrUtil.isEmpty(opc.getDomain()) ? " " : opc.getDomain());
ci.setUser(opc.getUser()); ci.setUser(opc.getUser());
ci.setPassword(opc.getPassword()); ci.setPassword(opc.getPassword());
ci.setClsid(opc.getCls_id()); ci.setClsid(opc.getCls_id());