From 05878afa90ad09f9c35f13bbdbbcb0a3f9ab08f8 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Thu, 21 Dec 2023 19:26:31 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=88=BB=E5=AD=97=E6=9C=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HailiangEngravingMachineDeviceDriver.java       | 13 +++++++++++++
 .../hailiang_engraving_machine/ItemProtocol.java    |  8 ++++++++
 2 files changed, 21 insertions(+)

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 1deb72bf..09403a4a 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
@@ -117,6 +117,8 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
     int await_time = 0;
     //工单号
     int order = 0;
+    //不合格数量
+    int unqualified_qty = 0;
 
     int last_status = 0;
     int last_is_open = 0;
@@ -140,6 +142,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
     int last_device_running_time = 0;
     int last_await_time = 0;
     int last_order = 0;
+    int last_unqualified_qty = 0;
 
     //设备在线状态
     Boolean isonline = true;
@@ -212,6 +215,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
             await_time = this.itemProtocol.getItem_await_time(); //待机时间（S)
             order = this.itemProtocol.getItem_order(); //工单号
             isonline = this.itemProtocol.getIsonline();
+            unqualified_qty = this.itemProtocol.getItem_unqualified_qty();
 
             if (mode != last_mode) {
                 feedDeviceStatusFlag = false;
@@ -229,6 +233,14 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
             if (is_running != last_is_running) {
                 logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("is_running") + SignalEnum.getDescByCode("is_running") +"："+ last_is_running + "->" + is_running);
             }
+            if (unqualified_qty != last_unqualified_qty) {
+                if (order > 0 && this.itemProtocol.getIsonline()) {
+                    Map<String, Integer> feedNumMap = new HashMap<>();
+                    feedNumMap.put("nok_qty", unqualified_qty);
+                    MonitoringLargeScreenData.deviceNumData.put(this.getDevice().getDevice_code(), feedNumMap);
+                }
+                logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("unqualified_qty") + SignalEnum.getDescByCode("unqualified_qty") + "：" + last_unqualified_qty + "->" + unqualified_qty);
+            }
             if (empty_req != last_empty_req) {
                 if (empty_req == 1) {
                     requireSucess = false;
@@ -542,6 +554,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
         last_await_time = await_time;
         last_order = order;
         last_isonline = isonline;
+        last_unqualified_qty = unqualified_qty;
     }
 
     /**
diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/ItemProtocol.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/ItemProtocol.java
index 43289f20..af44dd3a 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/ItemProtocol.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/ItemProtocol.java
@@ -35,6 +35,8 @@ public class ItemProtocol {
     public static String item_await_time = "await_time"; //待机时间（S)
     public static String item_order = "order"; //工单号
 
+    public static String item_unqualified_qty = "unqualified_qty";//不合格数量
+
     //开机
     public static String item_to_open = "to_open";
     //AGV放空箱完成
@@ -160,6 +162,11 @@ public class ItemProtocol {
         return this.getOpcIntegerValue(item_order);
     }
 
+    public int getItem_unqualified_qty() {
+        return this.getOpcIntegerValue(item_unqualified_qty);
+    }
+
+
     //是否有货
     public int hasGoods(int move) {
         return move;
@@ -203,6 +210,7 @@ public class ItemProtocol {
         list.add(new ItemDto(item_open_ready_time, "开机准备时间", "DB1.D108"));
         list.add(new ItemDto(item_device_running_time, "设备运转时间", "DB1.D112"));
         list.add(new ItemDto(item_await_time, "待机时间", "DB1.D116"));
+        list.add(new ItemDto(item_unqualified_qty, "不合格数量", "DB1.D120"));
         list.add(new ItemDto(item_order, "工单号", "DB1.D160"));
         return list;
     }