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

Update SiemensConveyorDeviceDriver.java

Browse Source
This commit is contained in:
张江玮
2023-02-02 09:23:59 +08:00
parent cf2f5419d3
commit 1706d2b1f0
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
View File

@@ -113,6 +113,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
boolean requireApplyLaStrangulationSuccess = false; boolean requireApplyLaStrangulationSuccess = false;
boolean requireEmptyInSuccess = false; boolean requireEmptyInSuccess = false;
boolean requireEmptyOutSuccess = false; boolean requireEmptyOutSuccess = false;
boolean requiresShipDeviceUpdate = false;
private int instruction_finished_time_out; private int instruction_finished_time_out;
int branchProtocol = 0; int branchProtocol = 0;
@@ -161,6 +162,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
message = null; message = null;
inst_message = null; inst_message = null;
this.clearWrite(); this.clearWrite();
if (last_move == 1) {
this.requiresShipDeviceUpdate = false;
}
} }
logServer.deviceItemValue(this.device_code, "move", String.valueOf(move)); logServer.deviceItemValue(this.device_code, "move", String.valueOf(move));
logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move); logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move);
@@ -239,10 +243,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
message = ""; message = "";
Instruction instruction = null; Instruction instruction = null;
List toInstructions; List toInstructions;
if (last_move == 1 && move == 0) {
// 有货变无货请求lms
this.shipDeviceUpdate();
}
// if (mode == 2 && move != 0 && task > 0) { // if (mode == 2 && move != 0 && task > 0) {
@@ -269,6 +269,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
if (move > 0 && !requireSucess) { if (move > 0 && !requireSucess) {
instruction_require(); instruction_require();
} }
if (!requiresShipDeviceUpdate) {
this.shipDeviceUpdate();
}
break; break;
case 4: case 4:
//申请捆扎 //申请捆扎
@@ -320,6 +323,8 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
}}; }};
acsToWmsService.shipDeviceUpdate(param); acsToWmsService.shipDeviceUpdate(param);
this.requiresShipDeviceUpdate = true;
} }