From 93b6ca1055837071d576501053abf76b60f9142b Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Wed, 26 Oct 2022 19:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hailiang_packing/HaiLiangPackingDefination.java   |  6 +++---
 .../lamp_three_color/LampThreecolorDeviceDriver.java  |  6 ++----
 .../quartz/task/QueryMagicAgvDeviceStatus.java        | 11 ++++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/HaiLiangPackingDefination.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/HaiLiangPackingDefination.java
index a48b487..89cb57e 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/HaiLiangPackingDefination.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_packing/HaiLiangPackingDefination.java
@@ -18,17 +18,17 @@ import java.util.List;
 public class HaiLiangPackingDefination implements OpcDeviceDriverDefination {
     @Override
     public String getDriverCode() {
-        return "lamp_three_color";
+        return "lamp_three_color1";
     }
 
     @Override
     public String getDriverName() {
-        return "标准版-三色灯";
+        return "海亮包裝機";
     }
 
     @Override
     public String getDriverDescription() {
-        return "标准版-三色灯";
+        return "海亮包裝機";
     }
 
     @Override
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java
index fb862e4..68a7005 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java
@@ -49,13 +49,11 @@ public class LampThreecolorDeviceDriver extends AbstractOpcDeviceDriver implemen
     int mode = 0;
     int action = 0;
     int error = 0;
-    int move = 0;
-    int task = 0;
+
     int last_action = 0;
     int last_mode = 0;
     int last_error = 0;
-    int last_move = 0;
-    int last_task = 0;
+
 
     boolean hasVehicle = false;
     boolean isReady = false;
diff --git a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvDeviceStatus.java b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvDeviceStatus.java
index a773977..91df480 100644
--- a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvDeviceStatus.java
+++ b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryMagicAgvDeviceStatus.java
@@ -7,6 +7,7 @@ import net.sf.json.JSONObject;
 import org.nl.acs.agv.server.AgvService;
 import org.nl.acs.device_driver.electric_fence.ElectricFenceDeviceDriver;
 import org.nl.acs.device_driver.hailiang.hailiang_packing.HaiLiangPackingDeviceDriver;
+import org.nl.acs.device_driver.lamp_three_color.LampThreecolorDeviceDriver;
 import org.nl.acs.device_driver.ndxy_special_two.NdxySpecialTwoDeviceDriver;
 import org.nl.acs.device_driver.weighing_site.WeighingSiteDeviceDriver;
 import org.nl.acs.instruction.service.InstructionService;
@@ -50,7 +51,7 @@ public class QueryMagicAgvDeviceStatus {
                 List<Device> allDevice = appService.findAllDevice();
                 WeighingSiteDeviceDriver weighingSiteDeviceDriver;
                 NdxySpecialTwoDeviceDriver ndxySpecialTwoDeviceDriver;
-                HaiLiangPackingDeviceDriver haiLiangPackingDeviceDriver;
+                LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
                 for (int z = 0; z < allDevice.size(); z++) {
                     Device deviceBycode = allDevice.get(z);
                     if (deviceBycode.getDeviceDriver() instanceof WeighingSiteDeviceDriver) {
@@ -66,14 +67,14 @@ public class QueryMagicAgvDeviceStatus {
 //                            ndxySpecialTwoDeviceDriver.writing("to_agv_status",0);
 //                        }
 //                    }
-                    if (deviceBycode.getDeviceDriver() instanceof HaiLiangPackingDeviceDriver){
-                        haiLiangPackingDeviceDriver = (HaiLiangPackingDeviceDriver) deviceBycode.getDeviceDriver();
+                    if (deviceBycode.getDeviceDriver() instanceof LampThreecolorDeviceDriver){
+                        lampThreecolorDeviceDriver = (LampThreecolorDeviceDriver) deviceBycode.getDeviceDriver();
                         if(jo.optString("state").equals("IDLE") || jo.optString("state").equals("EXECUTING")){
-                            haiLiangPackingDeviceDriver.writing(0);
+                            lampThreecolorDeviceDriver.writing(0);
                             flag = false;
                         } else if (jo.optString("state").equals("ERROR")){
                             if (!flag){
-                                haiLiangPackingDeviceDriver.writing(3);
+                                lampThreecolorDeviceDriver.writing(3);
                                 flag = true;
                             }
                         }