root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev 在线状态

Browse Source
This commit is contained in:
gengby
2023-05-09 14:35:18 +08:00
parent b974006173
commit 9b8d295fe7
20 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_feeding_line/HailiangCleaningFeedingLineDriver.java
View File

@@ -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());

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine/HailiangCleaningMachineDeviceDriver.java
View File

@@ -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;

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java
View File

@@ -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());

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java
View File

@@ -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;
}

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_cache/HailiangEngravingCacheDeviceDriver.java
View File

@@ -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());

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java
View File

@@ -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());

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java
View File

@@ -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");

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java
View File

@@ -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);

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java
View File

@@ -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);

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pick_station/HailiangOldSpecialPickStationDeviceDriver.java
View File

@@ -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;

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java
View File

@@ -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);

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java
View File

@@ -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);

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_sealing_machine/SealingMachineDeviceDriver.java
View File

@@ -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;
}

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java
View File

@@ -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");

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java
View File

@@ -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);

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java
View File

@@ -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);

4
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pick_station/HailiangSpecialPickStationDeviceDriver.java
View File

@@ -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;

2
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java
View File

@@ -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);

4
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_stacking_station/HailiangStackingStationDriver.java
View File

@@ -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;

1
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_unboxing_machine/UnboxingMachineDeviceDriver.java
View File

@@ -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;
}