#

whycq

2022-03-14 f19e1f429e3405202957b9c3dacbec06f0764a05

 src/main/java/com/zy/core/thread/SteThread.java

@@ -15,7 +15,6 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.SlaveType;
import com.zy.core.enums.SteStatusType;
import com.zy.core.model.SteSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.SteCommand;
@@ -176,10 +175,10 @@
                OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));

                // 复位信号
                if (steProtocol.getStatusType().equals(SteStatusType.WAITING)) {
                if (steProtocol.getWaiting()) {
                    if (resetFlag) {
                        SteCommand steCommand = new SteCommand();
//                        steCommand.setAckFinish((short)1);
                        steCommand.setComplete(true);
                        if (write(steCommand) && confirmPos()) {
                            resetFlag = false;
                        }
@@ -221,7 +220,7 @@
        command.setSteNo(slave.getId());
        OperateResult result = null;
        // 开始任务
        if (!command.getWaiting()) {
        if (!command.getComplete()) {
            OperateResult result0 = siemensS7Net.Write("D0", command.getTaskNo());
            short[] array = new short[10];
            array[0] = command.getTaskMode();