1

zhang

2 天以前 10ac21082bbbe92dabecdda1a98fe4539f746037

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java

@@ -3,10 +3,9 @@
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.zy.acs.common.utils.News;
import com.zy.acs.conveyor.core.constant.DeviceField;
import com.zy.acs.conveyor.core.constant.PlcAlarmDefinition;
import com.zy.acs.conveyor.core.constant.SafeSignalField;
import com.zy.acs.conveyor.core.constant.StationStatusField;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.*;
import com.zy.acs.conveyor.core.model.SafeSignal;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.service.DevpS7Service;
@@ -37,6 +36,9 @@
    private SiemensS7Net siemensS7Net;

    private Map<Integer, StaProtocol> station;

    private final RedisSupport redis = RedisSupport.defaultRedisSupport;


    private static final int WRITE_RETRY_MAX = 5;

@@ -336,6 +338,7 @@
                SafeSignalField.SAFE_SIGNAL_FROM_CONVEYOR.buildAddress(),
                (short) (staNoSize * SafeSignalField.SAFE_SIGNAL_FROM_CONVEYOR.getByteLength()));


        if (!result.IsSuccess) {
            log.warn("读取PLC安全交互信息异常 [id:{}]", slave.getId());
            return;
@@ -369,6 +372,17 @@
            staProtocolTake.setAllowPut(status2[2]);
            staProtocolTake.setInComplete(status2[3]);
            staProtocolTake.setOutComplete(status2[4]);
            //
            if (status[3]) {
                staProtocolPut.setSafeSignal( new SafeSignal(i, (short) 0, true));
                redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG,staProtocolPut);
            }
            if (status2[4]) {
                staProtocolTake.setSafeSignal(new SafeSignal(i, (short) 0, false));
                redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocolTake);

            }

        }
    }