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 25f28997..e9bd74e4 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 @@ -354,17 +354,17 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17 + ",inst == null :" + ObjectUtil.isEmpty(inst)); } - if (!this.itemProtocol.getIsonline()) { - //this.setIsonline(false); - //this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - //this.setIsonline(false); - // this.setIserror(true); - message = "未联机"; - //有报警 - } else { +// if (!this.itemProtocol.getIsonline()) { +// //this.setIsonline(false); +// //this.setIserror(true); +// message = "信号量同步异常"; +// //未联机 +// } else if (mode == 0) { +// //this.setIsonline(false); +// // this.setIserror(true); +// message = "未联机"; +// //有报警 +// } else { this.setIsonline(true); this.setIserror(false); message = ""; @@ -386,7 +386,6 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i this.noApplyTaskMessage = this.replace(notApplyTaskMessage); } } - if (mode == 1 && req_task_empty == 1 && !requireSucess) { boolean flag = apply_take_empty_task(); this.noApplyTaskMessage = null; @@ -488,7 +487,7 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i this.noFeedAgvMessage = this.replace(noFeedMessage); } } - } +// } last_packer_error = packer_error; last_out_num = out_num; last_agv_abutment_error = agv_abutment_error; @@ -593,13 +592,17 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i String bag_total_num = ealingOrderDto.getOrder_bag_num(); String time = ealingOrderDto.getTime(); Map map = new LinkedHashMap<>(); - map.put("to_clear", "1"); + this.writing("to_clear", "1"); +// this.writing("to_order", dto.getOrder_code()); +// this.writing("to_order_prod_num", bag_total_num);//包装机总包数 +// this.writing("to_box_total_num", box_total_num);//总箱数 +// this.writing("to_bag_total_num", bag_total_num);//总袋数 + map.put("to_order", dto.getOrder_code()); // map.put("to_order_prod_num", String.valueOf(dto.getQty())); map.put("to_order_prod_num", bag_total_num);//包装机总包数 map.put("to_box_total_num", box_total_num);//总箱数 map.put("to_bag_total_num", bag_total_num);//总袋数 - this.writing(map); } }