diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index 46bc9524..64e09103 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -230,101 +230,11 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements try { device_code = this.getDeviceCode(); mode = this.itemProtocol.getMode(); - - if(mode==1){ + log.info("当前呼叫设备号:{},设备桩信号:{}",device_code,mode); taskAgvService.autoCreate(device_code); } -// if (move != last_move) { -// requireSucess = false; -// clearWrite(); -// } - -// if (move != 0 && task > 0) { -// if (null!=inst) { -// inst_message = "指令号:" + inst.getInstruction_code() + " " + inst.getStart_point_code() + "->" + inst.getNext_point_code(); -// } -// CompletableFuture.runAsync(() -> { -// // 异步更新指令状态 -// try { -// update_instruction_status(); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// }); -// } -// //申请空托盘出库 -// if (mode == 8 && !requireSucess) { -// if (container_type == 0) { -// message = "托盘类型为空"; -// }else { -// applyEmptyTask(StorageTypeEnum.DISKS_OUT.getType(), mode); -// } -// -// } -// -// if (mode == 0) { -// this.setIsonline(false); -// message = "脱机"; -// } else if (error != 0) { -// this.setIserror(true); -// message = "有报警"; -// -// } else { -// this.setIsonline(true); -// this.setIserror(false); -// message = ""; -// Instruction instruction = null; -// List toInstructions; -// -// switch (mode) { -// case 1: -// log.debug("弃用(留作兼容)"); -// break; -// case 2: -// //申请任务 -// if (move == 1 && !requireSucess) { -// -// instruction_require(); -// } else { -// String remark = ""; -// ; -// if (mode != 2) { -// remark = "universal_remark2"; -// } -// if (move != 0) { -// remark = "universal_remark3"; -// } -// if (task != 0) { -// remark = "universal_remark4"; -// if (ObjectUtil.isNotEmpty(this.inst)) { -// this.inst = null; -// } -// } -// if (requireSucess) { -// remark = "universal_remark5"; -// } -// this.setNotCreateInstMessage(remark); -// //} -// } -// break; -// case 3: -// log.info("运行中"); -// break; -// case 4: -// //申请出货 -// if (move == 1 && !requireSucess) { -// //request_for_shipment(String.valueOf(mode), item_out_seq_arr, item_out_qty_arr); -// } -// break; -// -// -// default: -// break; -// } -// } - } catch (Exception var17) { this.iserror = true; LuceneLogDto logDto = LuceneLogDto.builder() diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java index 04f1f829..104b76d0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java @@ -167,7 +167,7 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_mode, "工作模式", "40001", Boolean.valueOf(true))); + list.add(new ItemDto(item_mode, "工作模式", "10001", Boolean.valueOf(true))); return list; }