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

fix:堆垛机驱动路由判断修复

Browse Source
This commit is contained in:
miguannan
2026-07-31 09:03:06 +07:00
parent 5d2ba4d87f
commit 1252a6aa71
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDeviceDriver.java
View File

@@ -535,7 +535,7 @@ public class DoubleStationStackerDeviceDriver extends AbstractOpcDeviceDriver im
for (RouteLineDto routeLineDto : routeLines) {
if (this.getDeviceCode().equals(routeLineDto.getNext_device_code())) {
List<RouteLineDto> routeLineDtoList = routeLineService.selectDeviceCodeList(this.getDeviceCode());
if (CollUtil.isEmpty(routeLines) || routeLines.size() < 1) {
if (CollUtil.isEmpty(routeLineDtoList) || routeLineDtoList.size() < 1) {
message = "没有输送线到堆垛机的路由";
logServer.deviceExecuteLog(this.device_code, "", "", "没有" + instruction.getStart_device_code() + "->"
+ this.device_code + "的路由");

34
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java
View File

@@ -522,20 +522,28 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
String width = jo.get("width").toString();
String height = jo.get("height").toString();
String isBinding = jo.get("isBinding").toString();
String isLabeling = jo.get("isLabeling").toString();
String printQty = jo.get("printQty").toString();
String labelingTemplate = jo.get("labelingTemplate").toString();
String bindingTemplate = jo.get("bindingTemplate").toString();
String printDevice = jo.get("printDevice").toString();
String bundleTimes = jo.get("bundleTimes").toString();
String to_case = jo.get("box_structure").toString();
if (mode == 10 || mode == 16) {
List<String> keys = Arrays.asList(ItemProtocol.TO_LENGTH.getKey(), ItemProtocol.TO_WIDTH.getKey(), ItemProtocol.TO_HEIGHT.getKey(),
ItemProtocol.TO_IS_BINDING.getKey(), ItemProtocol.TO_COMMAND.getKey(),
List<String> keys = Arrays.asList(
ItemProtocol.TO_LENGTH.getKey(),
ItemProtocol.TO_WIDTH.getKey(),
ItemProtocol.TO_HEIGHT.getKey(),
ItemProtocol.TO_IS_BINDING.getKey(),
ItemProtocol.TO_BINDING_TEMPLATE.getKey(),
ItemProtocol.TO_BINDING_TIMES.getKey());
List<Object> values = Arrays.asList(length, width, height, isBinding, mode, isLabeling, printQty, printDevice, bindingTemplate, bundleTimes, labelingTemplate, to_case);
ItemProtocol.TO_BINDING_TIMES.getKey(),
ItemProtocol.TO_COMMAND.getKey()
);
List<Object> values = Arrays.asList(
length,
width,
height,
isBinding,
bindingTemplate,
bundleTimes,
mode);
this.writing(keys, values);
}
this.requireSuccess = true;
@@ -628,10 +636,10 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
return;
}
List<String> targetDeviceCode = this.getExtraDeviceCodes("targetDeviceCode");
if (!targetDeviceCode.contains(inst.getNext_device_code())) {
this.unExecutedMessage = LangProcess.msg("310006");
return;
}
// if (!targetDeviceCode.contains(next_device_code)) {
// this.unExecutedMessage = LangProcess.msg("310006");
// return;
// }
//判断终点是否是双向点位
if (!this.isIssued(nextDevice)) {
this.unExecutedMessage = LangProcess.msg("310004");