#

lsh

2024-05-16 9dd3b9931d4fdf76de7d1989ef32ed00ec952c9a

 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;
@@ -87,7 +85,6 @@
                for (RgvSlave rgv : slaveProperties.getRgv()) {
                    if (!rgv.getDemo()){
                        continue;

                    }
                    SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                    StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
@@ -361,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()){//允许放

            }

        }
    }



}