#

1

2 天以前 68242c8f3acc051368eeb1246b2fb6327a783bfc

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

@@ -448,6 +448,8 @@
        OperateResultExOne<byte[]> result4 = null;//1054-1079
        OperateResultExOne<byte[]> result5 = null;//1080-1110
        OperateResultExOne<byte[]> resultErr = null;
        OperateResultExOne<byte[]> resultAlarm = null;

        if(staNoSize == 102){
            result1 = siemensS7Net.Read("DB100.0", (short) (2768));//1001-1028
            result2 = siemensS7Net.Read("DB101.0", (short) (1268));//1029-1037
@@ -455,11 +457,13 @@
            result4 = siemensS7Net.Read("DB103.0", (short) (2824));//1054-1079
            result5 = siemensS7Net.Read("DB102.0", (short) (3428));//1080-1110
            resultErr = siemensS7Net.Read("DB3.0", (short) (536));
//            resultAlarm = siemensS7Net.Read("DB800.0", (short) (220));
        }else{
            result1 = siemensS7Net.Read("DB200.0", (short) (3000));//2001-2030
            result2 = siemensS7Net.Read("DB201.0", (short) (720));//2031-2037
            result3 = siemensS7Net.Read("DB400.0", (short) (600));//4001-4006
            resultErr = siemensS7Net.Read("DB3.0", (short) (354));
//            resultAlarm = siemensS7Net.Read("DB800.0", (short) (126));

        }

@@ -562,6 +566,25 @@
                    staProtocol.setInEnable(status1[2]); // 可入
                    staProtocol.setOutEnable(status1[2]);// 可出
                    staProtocol.setErr(status1[6]);

//                    boolean[] statusAlarm = siemensS7Net.getByteTransform().TransBool(resultAlarm.Content, 2*i, 1);
//                    //报警
//                    staProtocol.setPassTimeOut(statusAlarm[0]);
//                    staProtocol.setObjectNoIdError(statusAlarm[1]);
//                    staProtocol.setIdNoObjectError(statusAlarm[2]);
//                    staProtocol.setLmfrError(statusAlarm[3]);
//                    staProtocol.setLiftError(statusAlarm[4]);
//                    staProtocol.setDlfrError(statusAlarm[5]);
//                    staProtocol.setDmfrError(statusAlarm[6]);
//                    staProtocol.setVfdError(statusAlarm[7]);
//                    staProtocol.setSrvError(statusAlarm[8]);
//                    staProtocol.setRes1(statusAlarm[9]);
//                    staProtocol.setRes2(statusAlarm[10]);
//                    staProtocol.setRes3(statusAlarm[11]);
//                    staProtocol.setCommunicationTimeOut(statusAlarm[12]);
//                    staProtocol.setParameterIncompleteError(statusAlarm[13]);
//                    staProtocol.setDataNotClear(statusAlarm[14]);
//                    staProtocol.setSetParameterError(statusAlarm[15]);

                    //报警
                    staProtocol.setPassTimeOut(statusErr[0]);
@@ -669,7 +692,7 @@
        OperateResultExOne<byte[]> reasultBarcode3 = siemensS7Net.Read("DB102.2780", (short) 4);//1103
        OperateResultExOne<byte[]> reasultBarcode4 = siemensS7Net.Read("DB201.344", (short) 4);//2037
        OperateResultExOne<byte[]> reasultBarcode5 = siemensS7Net.Read("DB400.112", (short) 4);//4001
        OperateResultExOne<byte[]> reasultBarcode6 = siemensS7Net.Read("DB201.716", (short) 4);//4001
        OperateResultExOne<byte[]> reasultBarcode6 = siemensS7Net.Read("DB201.716", (short) 4);//2033

        if(barcodeList.get(0) == 0){
            if(reasultBarcode1.IsSuccess){