lyd/liaoninghexing
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

rev 驱动更新

Browse Source
This commit is contained in:
周俊杰
2023-09-10 17:31:10 +08:00
parent f5c8c3723b
commit a8874188cb
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -353,8 +353,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){ if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){
conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver(); conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
conveyorBarcodeDeviceDriver.writing(3); conveyorBarcodeDeviceDriver.writing(3);
if (conveyorBarcodeDeviceDriver.getMode() != 0 if (conveyorBarcodeDeviceDriver.getMode() == 2
&& conveyorBarcodeDeviceDriver.getMove() != 0
) { ) {
inst.setExecute_status("1"); inst.setExecute_status("1");
instructionService.update(inst); instructionService.update(inst);
@@ -592,7 +591,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){ if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){
conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver(); conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
conveyorBarcodeDeviceDriver.writing(3); conveyorBarcodeDeviceDriver.writing(3);
if (conveyorBarcodeDeviceDriver.getMode() != 0) { if (conveyorBarcodeDeviceDriver.getMode() == 2) {
inst.setExecute_status("5"); inst.setExecute_status("5");
instructionService.update(inst); instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
@@ -855,8 +854,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){ if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){
conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver(); conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
conveyorBarcodeDeviceDriver.writing(4); conveyorBarcodeDeviceDriver.writing(4);
if (conveyorBarcodeDeviceDriver.getMode() != 0 if (conveyorBarcodeDeviceDriver.getMode() == 2){
&& conveyorBarcodeDeviceDriver.getMove() == 0){
inst.setExecute_status("3"); inst.setExecute_status("3");
instructionService.update(inst); instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
@@ -1102,8 +1100,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
//标准版-下发条码输送线 需要下发条码 //标准版-下发条码输送线 需要下发条码
if (device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver) { if (device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver) {
conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver(); conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
if (conveyorBarcodeDeviceDriver.getMode() != 0 if (conveyorBarcodeDeviceDriver.getMode() == 2){
&& conveyorBarcodeDeviceDriver.getMove() != 0){
inst.setExecute_status("6"); inst.setExecute_status("6");
instructionService.update(inst); instructionService.update(inst);
conveyorBarcodeDeviceDriver.writing(5); conveyorBarcodeDeviceDriver.writing(5);

14
acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import java.util.*?>
<?import javafx.scene.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<AnchorPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="$CONTROLLER_NAME$"
prefHeight="400.0" prefWidth="600.0">
</AnchorPane>