#

zjj

2024-05-22 49c4073d36f632fc8b449b34c2eb345ffa71053b

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

@@ -23,6 +23,7 @@
import com.zy.core.model.protocol.RgvProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;

import java.text.MessageFormat;
import java.util.Date;
@@ -145,6 +146,8 @@
        rgvProtocol.setxSpeed((short) 0);
        rgvProtocol.setxDistance((short) 0);
        rgvProtocol.setxDuration((short) 0);
        rgvProtocol.setSouSta((short)0);
        rgvProtocol.setEndSta((short)0);
    }

    @Override
@@ -172,7 +175,7 @@
     */
    private void readStatus(){
        try {
            OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) 30);
            OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) 16);
            if (result.IsSuccess) {
                if (null == rgvProtocol || rgvProtocol.getRgvNo() == null) {
                    rgvProtocol = new RgvProtocol();
@@ -185,22 +188,22 @@
                rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 8));
                rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 10));
                rgvProtocol.setSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 12));
                rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt32(result.Content, 14));
                rgvProtocol.setRgvPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 14));


                OutputQueue.RGV.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));

                // 工位1复位信号
                if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)
                        || rgvProtocol.getStatusType1().equals(RgvStatusType.FETCHWAITING)) {
                    if (resetFlag1) {
                        RgvCommand rgvCommand = new RgvCommand();
                        rgvCommand.setAckFinish1((short)1);
                        if (write(rgvCommand)) {
                            resetFlag1 = false;
                        }
                    }
                }
//                if (rgvProtocol.getStatusType1().equals(RgvStatusType.WAITING)
//                        || rgvProtocol.getStatusType1().equals(RgvStatusType.FETCHWAITING)) {
//                    if (resetFlag1) {
//                        RgvCommand rgvCommand = new RgvCommand();
//                        rgvCommand.setAckFinish1((short)1);
//                        if (write(rgvCommand)) {
//                            resetFlag1 = false;
//                        }
//                    }
//                }

                // 工位2复位信号
//                if (rgvProtocol.getStatusType2().equals(RgvStatusType.WAITING)
@@ -253,18 +256,23 @@
        boolean[] array = new boolean[1];
        array[0] = true;
        if (command.isAuto()){
            result = siemensNet.Write("DB99.0.1", array);
            result = siemensNet.Write("DB99.0.0", true);
        } else if (command.isRestoreTask()) {
            result = siemensNet.Write("DB99.0.2", array);
            result = siemensNet.Write("DB99.0.1", true);
        }
        else if (command.isCompTask()) {
            result = siemensNet.Write("DB99.0.3", array);
            result = siemensNet.Write("DB99.0.2", true);
        }
        else if (command.isStop()) {
            result = siemensNet.Write("DB99.0.4", array);
            result = siemensNet.Write("DB99.0.3", true);
        }
        else if (command.isReset()) {
            result = siemensNet.Write("DB99.0.5", array);
            siemensNet.Write("DB99.0.3", false);
            Thread.sleep(100);
            result = siemensNet.Write("DB99.0.4", true);
        }
        else if (command.isNoStop()) {
            result = siemensNet.Write("DB99.0.3", false);
        }

//        if (command.getAckFinish1() == 0 && command.getAckFinish2() == 0) {