From 9b8d295fe7da508f1ec893b7a5658a2079ed3d70 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Tue, 9 May 2023 14:35:18 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=E5=9C=A8=E7=BA=BF=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HailiangCleaningFeedingLineDriver.java | 2 +- .../HailiangCleaningMachineDeviceDriver.java | 2 +- .../HailiangCleaningMachineStorageStationDeviceDriver.java | 2 +- .../hailiang_ealing_machine/EalingMachineDeviceDriver.java | 2 +- .../HailiangEngravingCacheDeviceDriver.java | 2 +- .../HailiangEngravingMachineDeviceDriver.java | 2 +- .../HailiangOldSpecialDeviceDriver.java | 2 +- .../HailiangOldSpecialEmptyStationDeviceDriver.java | 2 +- .../HailiangOldSpecialFullStationDeviceDriver.java | 2 +- .../HailiangOldSpecialPickStationDeviceDriver.java | 2 +- .../HailiangOldSpecialPourStationDeviceDriver.java | 2 +- .../HailiangPackerStationDeviceDriver.java | 2 +- .../hailiang_sealing_machine/SealingMachineDeviceDriver.java | 2 +- .../hailiang_special_device/HailiangSpecialDeviceDriver.java | 2 +- .../HailiangSpecialEmptyStationDeviceDriver.java | 2 +- .../HailiangSpecialFullStationDeviceDriver.java | 2 +- .../HailiangSpecialPickStationDeviceDriver.java | 4 +++- .../HailiangSpecialPourStationDeviceDriver.java | 2 +- .../HailiangStackingStationDriver.java | 4 ++-- .../UnboxingMachineDeviceDriver.java | 1 + 20 files changed, 23 insertions(+), 20 deletions(-) diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_feeding_line/HailiangCleaningFeedingLineDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_feeding_line/HailiangCleaningFeedingLineDriver.java index dd9221d0..c5f12f07 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_feeding_line/HailiangCleaningFeedingLineDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_feeding_line/HailiangCleaningFeedingLineDriver.java @@ -301,7 +301,7 @@ public class HailiangCleaningFeedingLineDriver extends AbstractOpcDeviceDriver i jo.put("allowed_in", allowed_in == 1 ? "是" : "否"); jo.put("requireSucess", requireSucess.toString()); jo.put("in_pcsn", in_pcsn); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("error", ErrorUtil.getDictDetail("clean_up_error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine/HailiangCleaningMachineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine/HailiangCleaningMachineDeviceDriver.java index 902122fb..69a03b7e 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine/HailiangCleaningMachineDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine/HailiangCleaningMachineDeviceDriver.java @@ -184,7 +184,7 @@ public class HailiangCleaningMachineDeviceDriver extends AbstractOpcDeviceDriver public JSONObject getDeviceStatusName() throws Exception { JSONObject jo = new JSONObject(); jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("error", ErrorUtil.getDictDetail("clean_error_type", String.valueOf(this.getError()))); jo.put("driver_type", "hailiang_cleaning_feeding_line"); return jo; diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java index f9897330..b05f9ce3 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java @@ -226,7 +226,7 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO jo.put("device_name", this.getDevice().getDevice_name()); jo.put("silo_weight", silo_weight); jo.put("full_number", full_number); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("error", ErrorUtil.getDictDetail("clean_mach_error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java index 80b36f80..6782b258 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java @@ -247,7 +247,7 @@ public class EalingMachineDeviceDriver extends AbstractOpcDeviceDriver implement public JSONObject getDeviceStatusName() { JSONObject jo = new JSONObject(); jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); return jo; } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_cache/HailiangEngravingCacheDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_cache/HailiangEngravingCacheDeviceDriver.java index 1960c1c1..23a77192 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_cache/HailiangEngravingCacheDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_cache/HailiangEngravingCacheDeviceDriver.java @@ -204,7 +204,7 @@ public class HailiangEngravingCacheDeviceDriver extends AbstractOpcDeviceDriver jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode == 1 ? "联机" : "单机"); jo.put("move", move == 1 ? "有货" : "无货"); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); jo.put("noFeedAgvMessage", this.getNoFeedAgvMessage()); 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 431657a5..1a2ad181 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 @@ -667,7 +667,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive jo.put("lettering_silo_number", lettering_silo_number); jo.put("error", ErrorUtil.getDictDetail("eng_mach_error_type", String.valueOf(this.getError()))); jo.put("order", order); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); jo.put("noFeedAgvMessage", this.getNoFeedAgvMessage()); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java index 6e7310ab..7e36d48e 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java @@ -280,7 +280,7 @@ public class HailiangOldSpecialDeviceDriver extends AbstractOpcDeviceDriver impl jo.put("now_one_box_num", now_one_box_num); jo.put("line_stock_num", line_stock_num); jo.put("order_prod_allnum", order_prod_allnum); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); jo.put("driver_type", "hailiang_old_special_device"); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java index a8ac9882..28b42830 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java @@ -226,7 +226,7 @@ public class HailiangOldSpecialEmptyStationDeviceDriver extends AbstractOpcDevic jo.put("order", order); jo.put("error", ErrorUtil.getDictDetail("empty_error_type", String.valueOf(this.getError()))); jo.put("task", task); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); jo.put("is_click", true); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java index de1a82de..8b4c40d5 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java @@ -307,7 +307,7 @@ public class HailiangOldSpecialFullStationDeviceDriver extends AbstractOpcDevice jo.put("requireSucess", requireSucess.toString()); jo.put("error", ErrorUtil.getDictDetail("full_error_type", String.valueOf(this.getError()))); jo.put("task", task); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); jo.put("is_click", true); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pick_station/HailiangOldSpecialPickStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pick_station/HailiangOldSpecialPickStationDeviceDriver.java index 92f59b4f..d462fe1a 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pick_station/HailiangOldSpecialPickStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pick_station/HailiangOldSpecialPickStationDeviceDriver.java @@ -121,7 +121,7 @@ public class HailiangOldSpecialPickStationDeviceDriver extends AbstractOpcDevice public JSONObject getDeviceStatusName() { JSONObject jo = new JSONObject(); jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("driver_type", "hailiang_old_special_pick_station"); return jo; diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java index 8443e030..f51c611d 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java @@ -276,7 +276,7 @@ public class HailiangOldSpecialPourStationDeviceDriver extends AbstractOpcDevice jo.put("requireSucess", requireSucess.toString()); jo.put("error", ErrorUtil.getDictDetail("pour_error_type", String.valueOf(this.getError()))); jo.put("task", task); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); jo.put("is_click", true); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java index 39a154b2..19fe3ac3 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java @@ -638,7 +638,7 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i jo.put("hopper_removed", hopper_removed == 1 ? "是" : "否"); jo.put("order_now", order_now); jo.put("error", ErrorUtil.getDictDetail("packer_error_type", String.valueOf(this.getError()))); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); jo.put("is_click", true); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_sealing_machine/SealingMachineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_sealing_machine/SealingMachineDeviceDriver.java index f60ee3bb..2ef8446b 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_sealing_machine/SealingMachineDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_sealing_machine/SealingMachineDeviceDriver.java @@ -71,7 +71,7 @@ public class SealingMachineDeviceDriver extends AbstractOpcDeviceDriver implemen public JSONObject getDeviceStatusName() { JSONObject jo = new JSONObject(); jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); return jo; } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java index 4bc67c74..f517ad65 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java @@ -329,7 +329,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme jo.put("now_one_box_num", now_one_box_num); jo.put("line_stock_num", line_stock_num); jo.put("order_prod_allnum", order_prod_allnum); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); jo.put("driver_type", "hailiang_engraving_machine"); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java index 41a21849..012dbbbf 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java @@ -227,7 +227,7 @@ public class HailiangSpecialEmptyStationDeviceDriver extends AbstractOpcDeviceDr jo.put("order", order); jo.put("error", ErrorUtil.getDictDetail("empty_error_type", String.valueOf(this.getError()))); jo.put("task", task); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); jo.put("is_click", true); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java index 78b33981..dcaa3141 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java @@ -311,7 +311,7 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri jo.put("full_number", full_number); jo.put("error", ErrorUtil.getDictDetail("full_error_type", String.valueOf(this.getError()))); jo.put("task", task); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); jo.put("is_click", true); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pick_station/HailiangSpecialPickStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pick_station/HailiangSpecialPickStationDeviceDriver.java index 5d242a1e..9ce06a55 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pick_station/HailiangSpecialPickStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pick_station/HailiangSpecialPickStationDeviceDriver.java @@ -45,6 +45,7 @@ public class HailiangSpecialPickStationDeviceDriver extends AbstractOpcDeviceDri int last_now_one_prod_num = 0; Boolean isonline = true; + Boolean last_isonline = true; int hasGoods = 0; String message = null; Boolean iserror = false; @@ -72,6 +73,7 @@ public class HailiangSpecialPickStationDeviceDriver extends AbstractOpcDeviceDri mode = this.itemProtocol.getMode(); now_one_prod_num = this.itemProtocol.getItem_now_one_box_num(); order = this.itemProtocol.getOrder(); + isonline = this.itemProtocol.getIsonline(); if (mode != last_mode) { logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode); @@ -130,7 +132,7 @@ public class HailiangSpecialPickStationDeviceDriver extends AbstractOpcDeviceDri public JSONObject getDeviceStatusName() throws Exception { JSONObject jo = new JSONObject(); jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("driver_type", "hailiang_special_pick_station"); return jo; diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java index 2d547aad..475f94d3 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java @@ -281,7 +281,7 @@ public class HailiangSpecialPourStationDeviceDriver extends AbstractOpcDeviceDri jo.put("requireSucess", requireSucess.toString()); jo.put("error", ErrorUtil.getDictDetail("pour_error_type", String.valueOf(this.getError()))); jo.put("task", task); - jo.put("isOnline", this.getIsonline()); + jo.put("isOnline", this.itemProtocol.getIsonline()); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); jo.put("is_click", true); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_stacking_station/HailiangStackingStationDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_stacking_station/HailiangStackingStationDriver.java index 949be561..4b2f864e 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_stacking_station/HailiangStackingStationDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_stacking_station/HailiangStackingStationDriver.java @@ -416,8 +416,8 @@ public class HailiangStackingStationDriver extends AbstractOpcDeviceDriver imple jo.put("order", order); jo.put("error", ErrorUtil.getDictDetail("stack_error_type", String.valueOf(line_error))); jo.put("lane_error", ErrorUtil.getDictDetail("stack_error_type", String.valueOf(lane_error))); - jo.put("isOnline", this.getMode() == 1 ? true : false); - jo.put("isError", this.getLane_error() != 0 || this.getLine_error() != 0 ? true : false); + jo.put("isOnline", this.itemProtocol.getIsonline()); + jo.put("isError", (this.getLane_error() != 0 || this.getLine_error() != 0) ? true : false); jo.put("message", this.getMessage()); jo.put("driver_type", "hailiang_stacking_station"); return jo; diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_unboxing_machine/UnboxingMachineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_unboxing_machine/UnboxingMachineDeviceDriver.java index e3fa8a50..2f7753b8 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_unboxing_machine/UnboxingMachineDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_unboxing_machine/UnboxingMachineDeviceDriver.java @@ -166,6 +166,7 @@ public class UnboxingMachineDeviceDriver extends AbstractOpcDeviceDriver impleme public JSONObject getDeviceStatusName() { JSONObject jo = new JSONObject(); jo.put("device_name", this.getDevice().getDevice_name()); + jo.put("isOnline", this.itemProtocol.getIsonline()); return jo; }