#

lsh

2024-06-22 a64aaeecc264176a60c6bb0e4e348c63f929d459

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

@@ -123,27 +123,32 @@
                    jarProtocol = new JarProtocol();
                    jarProtocol.setJarNo(slave.getId());
                }
                jarProtocol.setLeftDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 0) != 0);//左门状态
                jarProtocol.setRightDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 2) != 0);//右门状态
                jarProtocol.setLeftInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 4) != 0);//左门可开
                jarProtocol.setLeftOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 5) != 0);//左门可关
                jarProtocol.setRightInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 8) != 0);//右门可开
                jarProtocol.setRightOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 10) != 0);//右门可关

                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);//右门状态  //进料门
                    jarProtocol.setRightInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 4) != 0);//左门可开  //出料门
                    jarProtocol.setRightOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 6) != 0);//左门可关  //出料门
                    jarProtocol.setLeftInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 8) != 0);//右门可开  //进料门
                    jarProtocol.setLeftOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 10) != 0);//右门可关  //进料门
                    jarProtocol.setRightDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 18));//open the left door  //出料门
                    jarProtocol.setRightDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 20));//close the left door  //出料门
                    jarProtocol.setLeftDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 22));//open the right door  //进料门
                    jarProtocol.setLeftDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 24));//close the right door  //进料门
                } else {
                    jarProtocol.setLeftDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 0) != 0);//左门状态  //进料门
                    jarProtocol.setRightDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 2) != 0);//右门状态  //出料门
                    jarProtocol.setLeftInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 4) != 0);//左门可开  //进料门
                    jarProtocol.setLeftOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 6) != 0);//左门可关  //进料门
                    jarProtocol.setRightInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 8) != 0);//右门可开  //出料门
                    jarProtocol.setRightOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, 10) != 0);//右门可关  //出料门
                    jarProtocol.setLeftDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 18));//open the left door  //进料门
                    jarProtocol.setLeftDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 20));//close the left door  //进料门
                    jarProtocol.setRightDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 22));//open the right door  //出料门
                    jarProtocol.setRightDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 24));//close the right door  //出料门
                }
                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.setLeftDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 18));//open the left door

                jarProtocol.setLeftDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 20));//close the left door

                jarProtocol.setRightDoorOpen((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 22));//open the right door

                jarProtocol.setRightDoorClose((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 24));//close the right door


                jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) != 2);//自动
                // 根据实时信息更新数据库