From dd60bcc7b38c2a19c02a20550a393987fc5a5a27 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期三, 07 八月 2024 16:26:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java index 3e8dcab..b99a4a0 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java @@ -126,6 +126,16 @@ } } + @Scheduled(fixedDelay = 300) + public void plcShelfFull() { + List<DownWorkstation> list = downGlassInfoService.queryWorkStationIsFull(); + if (CollectionUtils.isNotEmpty(list)) { + S7control s7control = S7object.getinstance().plccontrol; + PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject; + s7control.writeWord(plcMesObject.getPlcParameter("alarm_signal").getAddress(), 1); + } + } + public void inTo(String glassId, String requestWord, String currentSlot) { log.info("1銆佹寜鐓х幓鐠僫d:{}鑾峰彇鐜荤拑灏忕墖淇℃伅,褰撳墠鏍煎瓙涓�:{}", glassId, currentSlot); //娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸 -- Gitblit v1.8.0