diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java index a68b695..c3ddc8c 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java @@ -212,7 +212,7 @@ public class HfGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp if (StrUtil.equals(inst2.getInstruction_status(), "1")) { this.finish_instruction(inst2); //获取当前工单数量 - TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code()); + TaskDto taskDto = taskserver.findByCode(inst2.getTask_code()); if (ObjectUtil.isNotEmpty(taskDto)) { if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { String next_device_code = inst2.getNext_device_code(); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java index ba31fe4..06cc2c4 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java @@ -203,7 +203,7 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev if (StrUtil.equals(inst1.getInstruction_status(), "1")) { finish_instruction(inst1); JSONArray array = new JSONArray(); - TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code()); + TaskDto taskDto = taskserver.findByCode(inst1.getTask_code()); if (ObjectUtil.isNotEmpty(taskDto)) { if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { JSONObject map = new JSONObject(); @@ -242,7 +242,7 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev if (StrUtil.equals(inst2.getInstruction_status(), "1")) { finish_instruction(inst2); JSONArray array = new JSONArray(); - TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code()); + TaskDto taskDto = taskserver.findByCode(inst2.getTask_code()); if (ObjectUtil.isNotEmpty(taskDto)) { if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) { JSONObject map = new JSONObject(); diff --git a/lms/nladmin-system/doc/sch2.xls b/lms/nladmin-system/doc/sch2.xls deleted file mode 100644 index 4085eed..0000000 Binary files a/lms/nladmin-system/doc/sch2.xls and /dev/null differ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls deleted file mode 100644 index 6efd924..0000000 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls and /dev/null differ