#
yxFwq
2024-11-19 fe198a9143ad5a6840f664a2f6c2cfa1beff0e57
src/main/java/com/zy/core/thread/JarThread.java
@@ -122,6 +122,7 @@
                    jarProtocol = new JarProtocol();
                    jarProtocol.setJarNo(slave.getId());
                }
                jarProtocol.setJarNo(slave.getId());
                jarProtocol.setMode(2);//模式
                jarProtocol.setStatus((short)0);//状态
                jarProtocol.setAutoing(true);//自动
@@ -134,15 +135,16 @@
                jarProtocol.setRightDoorOpen(0);//open the right door  //出料门
                jarProtocol.setRightDoorClose(0);//close the right door  //出料门
                jarProtocol.setJarTemperature(0);
                jarProtocol.setJarTemperature(0.0F);
                return;
            }
            OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 28);
            OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 30);
            if (result.IsSuccess) {
                if (null == jarProtocol) {
                    jarProtocol = new JarProtocol();
                    jarProtocol.setJarNo(slave.getId());
                }
                jarProtocol.setJarNo(slave.getId());
                if (slave.getId() == 1 || slave.getId() == 3){
                    jarProtocol.setRightDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 0) != 0);//左门状态  //出料门
                    jarProtocol.setLeftDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 2) != 0);//右门状态  //进料门
@@ -169,7 +171,7 @@
                jarProtocol.setMode((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 12));//模式
                jarProtocol.setJarErr((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 14));//异常码
                jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));//状态
                jarProtocol.setJarTemperature((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 18));//温度
                jarProtocol.setJarTemperature(siemensS7Net.getByteTransform().TransSingle(result.Content, 26));//温度
                jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//自动
@@ -224,7 +226,7 @@
        String resultV2 = null;
        short resultS2 = 0;
        switch (command.getTaskMode()){
        switch (command.getTaskModeType().id){
            case 1:
            case 2:
            case 3: