From 3d1b6119e1ff1a161c7bcfcb916a8059b5b32f55 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Thu, 6 Jul 2023 16:31:42 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=88=BB=E5=AD=97=E6=9C=BA=E5=8F=96?=
 =?UTF-8?q?=E6=94=BE=E8=B4=A7=E5=88=A4=E6=96=AD=E5=B7=A5=E4=BD=9C=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HailiangEngravingMachineDeviceDriver.java             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java
index 0ee89c2b..61f24a02 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java
@@ -428,7 +428,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
 
             //到达取货点
             if (agvphase == 0x03) {
-                if (ObjectUtil.isNotEmpty(inst) && move == 1) {
+                if (mode == 1 && ObjectUtil.isNotEmpty(inst) && move == 1) {
                     inst.setExecute_status(InstActionEnum.EXECUTE_TO_GET.getCode());
                     instructionService.update(inst);
                     byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
@@ -451,7 +451,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
 
             //取货完成
             if (agvphase == 0x05) {
-                if (ObjectUtil.isNotEmpty(inst) && move == 0) {
+                if (mode == 1 && ObjectUtil.isNotEmpty(inst) && move == 0) {
                     inst.setExecute_status(InstActionEnum.EXECUTE_GET_FINISH.getCode());
                     instructionService.update(inst);
                     byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
@@ -473,7 +473,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
             }
 
             if (agvphase == 0x07) {
-                if (ObjectUtil.isNotEmpty(inst) && move == 0) {
+                if (mode == 1 && ObjectUtil.isNotEmpty(inst) && move == 0) {
                     inst.setExecute_status(InstActionEnum.EXECUTE_TO_PUT_FALL_SEND_FULL.getCode());
                     instructionService.update(inst);
                     byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
@@ -495,7 +495,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
             }
 
             if (agvphase == 0x09) {
-                if (ObjectUtil.isNotEmpty(inst) && move == 1) {
+                if (mode == 1 && ObjectUtil.isNotEmpty(inst) && move == 1) {
                     inst.setExecute_status(InstActionEnum.EXECUTE_PUT_FALL_SEND_FULL_FINISH.getCode());
                     instructionService.update(inst);
                     byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);