diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_palletizing_manipulator_site/LnshPackagePalletizingManipulatorSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_palletizing_manipulator_site/LnshPackagePalletizingManipulatorSiteDeviceDriver.java index 23b77ea..c2ac226 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_palletizing_manipulator_site/LnshPackagePalletizingManipulatorSiteDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_palletizing_manipulator_site/LnshPackagePalletizingManipulatorSiteDeviceDriver.java @@ -1338,8 +1338,11 @@ public class LnshPackagePalletizingManipulatorSiteDeviceDriver extends AbstractO Map itemMap = new HashMap(); itemMap.put(to_command, 1); itemMap.put(to_task, instruction_num); - this.control(itemMap); - + try{ + this.checkcontrol(itemMap); + } catch (Exception e){ + e.printStackTrace(); + } } public void executing(Server server, Map itemMap) { @@ -1386,7 +1389,11 @@ public class LnshPackagePalletizingManipulatorSiteDeviceDriver extends AbstractO Map itemMap = new HashMap(); itemMap.put(to_command, command); - this.control(itemMap); + try{ + this.checkcontrol(itemMap); + } catch (Exception e){ + e.printStackTrace(); + } logServer.deviceExecuteLog(this.device_code, "", "", to_command + " 写入 " + command); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index ef44596..bb93788 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -710,6 +710,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { public void finish(String id) { TaskDto entity = this.findById(id); if (entity == null) throw new BadRequestException("被删除或无权限,操作失败!"); + if(StrUtil.equals(entity.getTask_status(),"2") || StrUtil.equals(entity.getTask_status(),"3")){ + log.info("任务已经被完成,操作失败!"); + return; + } InstructionService instructionservice = SpringContextHolder.getBean("instructionServiceImpl"); InstructionDto instdto = instructionservice.findByTaskid(id, "instruction_status <2 "); if (instdto != null) throw new BadRequestException("有指令未完成!"); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java index f933975..27a41bf 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java @@ -613,7 +613,9 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { && (lnshStationDeviceDriver.getIo_action() == 3 || lnshStationDeviceDriver.getIo_action() == 2)) { try { - lnshStationDeviceDriver.writing(3); + if(lnshStationDeviceDriver.getTo_command() != 3){ + lnshStationDeviceDriver.writing(3); + } } catch (Exception e) { log.info("下发电气信号失败:" + e.getMessage()); e.printStackTrace();