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

opt: 拔轴机申请套轴优化

Browse Source
This commit is contained in:
yanps
2024-01-23 17:39:49 +08:00
parent bb99c99e68
commit 41904ecbb5
5 changed files with 4 additions and 1476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java
View File

@@ -147,7 +147,7 @@ public class PluggingUnpluggingMachineDeviceDriver extends AbstractOpcDeviceDriv
case 3:
break;
case 4:
if ((task1 > 0) && !requireSucess) {
if (!requireSucess) {
applyBushing();
}
break;
@@ -274,14 +274,14 @@ public class PluggingUnpluggingMachineDeviceDriver extends AbstractOpcDeviceDriv
private synchronized void applyBushing() {
ApplyManipulatorActionRequest applyManipulatorActionRequest = new ApplyManipulatorActionRequest();
ApplyManipulatorActionResponse applyManipulatorActionResponse;
Instruction inst1 = instructionService.findByCode(String.valueOf(task1));
/*Instruction inst1 = instructionService.findByCode(String.valueOf(task1));
String task_code1 = inst1.getTask_code();
if (Long.parseLong(task_code1) < 1) {
message = "任务ACS创建,不向LMS申请套轴";
return;
}
}*/
applyManipulatorActionRequest.setDevice_code(device_code);
applyManipulatorActionRequest.setTask_code1(task_code1);
//applyManipulatorActionRequest.setTask_code1(task_code1);
applyManipulatorActionRequest.setType("6");
applyManipulatorActionResponse = acsToWmsService.applyManipulatorActionRequest(applyManipulatorActionRequest);
if (ObjectUtils.isNotEmpty(applyManipulatorActionResponse) && ("1".equals(applyManipulatorActionResponse.getIs_bushing()))) {