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

更新

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-01-29 19:09:16 +08:00
parent 8b055a5fe5
commit 0b40e04794
6 changed files with 51 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
View File

@@ -127,6 +127,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
if (mode != last_mode) {
if (mode == 2) {
this.setRequireSucess(false);
message = null;
}
logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
@@ -760,7 +761,11 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
} else if (this.getMove() == 1) {
move = "有货";
}
String requireSucess = "0";
if (this.requireSucess) {
requireSucess = "1";
}
jo.put("requireSucess", requireSucess);
if (this.getAction() == 1) {
action = "取货中";
} else if (this.getAction() == 2) {

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

@@ -145,6 +145,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
task = this.itemProtocol.getTask();
if (mode != last_mode) {
if( mode == 2){
message = null;
requireSucess = false;
requireApplyLabelingSuccess = false;
requireApplyLaStrangulationSuccess =false;
@@ -152,7 +153,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
requireEmptyOutSuccess =false;
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode +"复位请求标记");
}
logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
}

23
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java
View File

@@ -85,7 +85,9 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
int error = 0;
int task = 0;
String plcbarcode = null;
String last_plcbarcode = null;
int plcbarcode_length = 0;
int last_plcbarcode_length = 0;
Boolean isonline = true;
@@ -185,16 +187,31 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode +"复位请求标记");
this.setRequireSucess(false);
if(mode == 2){
this.setRequireSucess(false);
this.setApplySucess(false);
message = null;
}
}
if (move != last_move) {
if (move == 0 && mode == 2) {
thingToNothing();
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move);
}
if (error != last_error) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (plcbarcode_length != last_plcbarcode_length) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号plcbarcode_length：" + last_plcbarcode_length + "->" + plcbarcode_length);
}
if (!StrUtil.equals(plcbarcode,last_plcbarcode) ) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号plcbarcode：" + last_plcbarcode + "->" + plcbarcode);
}
if (task != last_task) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task+ "->" + task);
}
if (mode == 2 && move != 0 && task > 0) {
//inst_message
inst = instructionService.findByCodeFromCache(String.valueOf(task));
@@ -271,6 +288,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
last_error = error;
last_move = move;
last_task = task;
}
public boolean exe_error() {
@@ -734,7 +752,8 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
jo.put("isError", this.getIserror());
jo.put("message", this.getMessage());
jo.put("task", this.getTask());
jo.put("barcode", this.getBarcode());
jo.put("barcode", plcbarcode);
jo.put("barcode_length", plcbarcode_length);
String requireSucess = "0";
if (this.requireSucess) {
requireSucess = "1";