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

opt:株洲中钨优化

Browse Source
This commit is contained in:
zhengxuming
2025-09-11 17:12:43 +08:00
parent 53b6c5bd7a
commit 680b5ca455
11 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -294,7 +294,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} catch (Exception e) {
e.printStackTrace();
}
if (productionLineDockingStationDeviceDriver.getAction() == 1) {
if (productionLineDockingStationDeviceDriver.getAction() == 1 && productionLineDockingStationDeviceDriver.getMove() == 1) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(this.getDeviceCode())
@@ -585,7 +585,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} catch (Exception e) {
e.printStackTrace();
}
if (productionLineDockingStationDeviceDriver.getAction() == 1) {
if (productionLineDockingStationDeviceDriver.getAction() == 2 && productionLineDockingStationDeviceDriver.getMove()==0) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(this.getDeviceCode())
@@ -870,7 +870,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} catch (Exception e) {
e.printStackTrace();
}
if (productionLineDockingStationDeviceDriver.getAction() == 1) {
if (productionLineDockingStationDeviceDriver.getAction() == 1 && productionLineDockingStationDeviceDriver.getMove() == 1) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(this.getDeviceCode())
@@ -1151,7 +1151,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} catch (Exception e) {
e.printStackTrace();
}
if (productionLineDockingStationDeviceDriver.getAction() == 1) {
if (productionLineDockingStationDeviceDriver.getAction() == 2 && productionLineDockingStationDeviceDriver.getMove() == 0) {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0);
LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(this.getDeviceCode())

3
acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ProductionLineDockingStationDeviceDriver.java
View File

@@ -164,15 +164,14 @@ public class ProductionLineDockingStationDeviceDriver extends AbstractOpcDeviceD
this.setIserror(false);
}
last_mode = mode;
last_action = action;
last_move = move;
last_error = error;
last_to_command = to_command;
last_heartbeat = heartbeat;
}
public void writing(Map<String, Object> map) throws Exception {
Map<String, Object> itemMap = new LinkedHashMap<>();
map.forEach((key, value) -> {

5
acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/RemoveSealCoverPositionDriver.java
View File

@@ -70,6 +70,9 @@ public class RemoveSealCoverPositionDriver extends AbstractOpcDeviceDriver imple
//取放信号
int action = 0;
int last_action = 0;
//光电信号
int move = 0;
int last_move = 0;
//报警信号
int error = 0;
int last_error = 0;
@@ -165,6 +168,8 @@ public class RemoveSealCoverPositionDriver extends AbstractOpcDeviceDriver imple
last_task = task;
last_error = error;
last_to_command = to_command;
last_heartbeat = heartbeat;
last_move = move;
}