From a8874188cb272750bf97acca01c26f770db7ee94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E4=BF=8A=E6=9D=B0?=
 <9463626+zhou-junjiezjj@user.noreply.gitee.com>
Date: Sun, 10 Sep 2023 17:31:10 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=E9=A9=B1=E5=8A=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agv/ndcone/AgvNdcOneDeviceDriver.java          | 11 ++++-------
 .../src/main/resources/log/NDCAgvServiceImpl.xml   | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
index 075b1f0..2f4224d 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
@@ -353,8 +353,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){
                 conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
                 conveyorBarcodeDeviceDriver.writing(3);
-                if (conveyorBarcodeDeviceDriver.getMode() != 0
-                        && conveyorBarcodeDeviceDriver.getMove() != 0
+                if (conveyorBarcodeDeviceDriver.getMode() == 2
                 ) {
                     inst.setExecute_status("1");
                     instructionService.update(inst);
@@ -592,7 +591,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){
                 conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
                 conveyorBarcodeDeviceDriver.writing(3);
-                if (conveyorBarcodeDeviceDriver.getMode() != 0) {
+                if (conveyorBarcodeDeviceDriver.getMode() == 2) {
                     inst.setExecute_status("5");
                     instructionService.update(inst);
                     data = AgvService.sendAgvOneModeInst(phase, index, 0);
@@ -855,8 +854,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){
                 conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
                 conveyorBarcodeDeviceDriver.writing(4);
-                if (conveyorBarcodeDeviceDriver.getMode() != 0
-                        && conveyorBarcodeDeviceDriver.getMove() == 0){
+                if (conveyorBarcodeDeviceDriver.getMode() == 2){
                     inst.setExecute_status("3");
                     instructionService.update(inst);
                     data = AgvService.sendAgvOneModeInst(phase, index, 0);
@@ -1102,8 +1100,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-下发条码输送线 需要下发条码
             if (device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver) {
                 conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
-                if (conveyorBarcodeDeviceDriver.getMode() != 0
-                        && conveyorBarcodeDeviceDriver.getMove() != 0){
+                if (conveyorBarcodeDeviceDriver.getMode() == 2){
                     inst.setExecute_status("6");
                     instructionService.update(inst);
                     conveyorBarcodeDeviceDriver.writing(5);
diff --git a/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml b/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml
new file mode 100644
index 0000000..76e6024
--- /dev/null
+++ b/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml
@@ -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>