#

zjj

2024-01-15 855bf7559274cbc7e3008eaac313e49e48d14e33

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

@@ -144,9 +144,9 @@
        rgvProtocol.setLoaded1((short)0);
        rgvProtocol.setWalkPos((short)0);
        rgvProtocol.setRgvPos((short)0);
        rgvProtocol.setTaskNo2((short)0);
        rgvProtocol.setStatus2((short)-1);
        rgvProtocol.setLoaded2((short)0);
//        rgvProtocol.setTaskNo2((short)0);
//        rgvProtocol.setStatus2((short)-1);
//        rgvProtocol.setLoaded2((short)0);
        rgvProtocol.setAlarm((short)0);
        rgvProtocol.setxSpeed((short) 0);
        rgvProtocol.setxDistance((short) 0);
@@ -178,7 +178,7 @@
     */
    private void readStatus(){
        try {
            OperateResultExOne<byte[]> result = siemensNet.Read("DB1.0", (short) 34);
            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 30);
            if (result.IsSuccess) {
                if (null == rgvProtocol) {
                    rgvProtocol = new RgvProtocol();
@@ -191,16 +191,16 @@
                rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransInt16(result.Content, 8));
                rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
                rgvProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
//                rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 14));
                rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 14));
//                rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
//                rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 18));
                rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));
                rgvProtocol.setHeart(siemensNet.getByteTransform().TransInt16(result.Content, 22));
                rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));
                rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 18));
//                rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));
                rgvProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 22));
//                rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));
                rgvProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 26));
                rgvProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 28));
                rgvProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 30));
                rgvProtocol.setTemp5(siemensNet.getByteTransform().TransInt16(result.Content, 32));
//                rgvProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 28));
//                rgvProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 30));
//                rgvProtocol.setTemp5(siemensNet.getByteTransform().TransInt16(result.Content, 32));
//                rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
//                rgvProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
//                rgvProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
@@ -220,16 +220,16 @@
                }

                // 工位2复位信号
                if (rgvProtocol.getStatusType2().equals(RgvStatusType.WAITING)
                        || rgvProtocol.getStatusType2().equals(RgvStatusType.FETCHWAITING)) {
                    if (resetFlag2) {
                        RgvCommand rgvCommand = new RgvCommand();
                        rgvCommand.setAckFinish2((short)1);
                        if (write(rgvCommand)) {
                            resetFlag2 = false;
                        }
                    }
                }
//                if (rgvProtocol.getStatusType2().equals(RgvStatusType.WAITING)
//                        || rgvProtocol.getStatusType2().equals(RgvStatusType.FETCHWAITING)) {
//                    if (resetFlag2) {
//                        RgvCommand rgvCommand = new RgvCommand();
//                        rgvCommand.setAckFinish2((short)1);
//                        if (write(rgvCommand)) {
//                            resetFlag2 = false;
//                        }
//                    }
//                }

                try {
                    // 根据实时信息更新数据库
@@ -281,11 +281,11 @@
        array[10] = command.getCommand();
        OperateResult result = siemensNet.Write("DB100.0", array);

        if (command.getAckFinish1() == 0 && command.getAckFinish2() == 0) {
            short commandFinish = 3;  //工位1、2任务同时写入
            Thread.sleep(100L);
            result = siemensNet.Write("DB100.20", commandFinish);
        }
//        if (command.getAckFinish1() == 0 && command.getAckFinish2() == 0) {
//            short commandFinish = 3;  //工位1、2任务同时写入
//            Thread.sleep(100L);
//            result = siemensNet.Write("DB100.20", commandFinish);
//        }

        try {
            // 日志记录