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

fix:扫码位终点信号判断、信息提示

Browse Source
This commit is contained in:
lishuai
2024-08-01 08:52:51 +08:00
parent e191d4e5b9
commit 522ac0f93e
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
View File

@@ -765,6 +765,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
if (!ObjectUtil.isEmpty(taskdto)) {
if (creatInstruction(taskdto)) return false;
} else {
message = "未找到补码信息相匹配的任务";
//如果不存在则直接找对应指令直接下发信号
if (pushPLC()) return false;
@@ -776,6 +777,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
if (!ObjectUtil.isEmpty(taskdto)) {
if (creatInstruction(taskdto)) return false;
}else {
message = "未找到载具码信息相匹配的任务";
//如果不存在则直接找对应指令直接下发信号
if (pushPLC()) return false;
@@ -909,7 +911,18 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
return true;
}
Device nextdevice = deviceAppservice.findDeviceByCode(instdto.getNext_device_code());
BeltConveyorDeviceDriver beltConveyorDeviceDriver;
if (nextdevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) {
beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) nextdevice.getDeviceDriver();
String ignorePickupCheck = (String) beltConveyorDeviceDriver.getExtraValue().get("ignore_pickup_check");
if ("false".equals(ignorePickupCheck)) {
if (beltConveyorDeviceDriver.getMode() != 2 || beltConveyorDeviceDriver.getMove() == 1) {
log.error("输送机,{}未联机或执行中", instdto.getNext_device_code());
this.setNotCreateInstMessage("universal_notCreateInstMessage4");
return false;
}
}
}
//创建指令后修改任务状态
taskdto.setTask_status(TaskStatusEnum.BUSY.getIndex());
taskserver.update(taskdto);