From 7c2e048de56976c6ee3757cebf414a0f5c8dcb58 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期一, 22 四月 2024 16:30:09 +0800 Subject: [PATCH] #Ext --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index b67f5cc..af46969 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -29,13 +29,11 @@ import com.zy.core.model.command.LedCommand; import com.zy.core.model.command.RgvCommand; import com.zy.core.model.protocol.CrnProtocol; +import com.zy.core.model.protocol.ExtProtocol; import com.zy.core.model.protocol.RgvProtocol; import com.zy.core.model.protocol.StaProtocol; import com.zy.core.properties.SlaveProperties; -import com.zy.core.thread.BarcodeThread; -import com.zy.core.thread.LedThread; -import com.zy.core.thread.SiemensDevpThread; -import com.zy.core.thread.SiemensRgvThread; +import com.zy.core.thread.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -360,6 +358,28 @@ } } + public synchronized void ExtTaskAndPut() throws InterruptedException { + for (ExtSlave extSlave : slaveProperties.getExt()) { +// if (!rgv.getDemo()) { +// continue; +// } + MelsecExtThread extThread = (MelsecExtThread) SlaveConnection.get(SlaveType.Ext, extSlave.getId()); + ExtProtocol extProtocol = extThread.getExtProtocol(); + if (extProtocol == null) { + continue; + } +// else { +// extProtocol = extProtocol.clone(); +// } + if (extProtocol.isTake()){//鍏佽鍙� + + }else if (extProtocol.isPut()){//鍏佽鏀� + + } + + } + } + } -- Gitblit v1.9.1