#

1

4 天以前 556fa0e355ae22b6bfcf15d0a230cd5c1b1cb764

#

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

@@ -274,7 +274,7 @@
    private void readStatus(){
        try {

            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 42);
            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 41);
            if (result.IsSuccess) {
                if (null == rgvProtocol) {
                    rgvProtocol = new RgvProtocol();
@@ -306,7 +306,7 @@
                rgvProtocol.setErr10(status3[1]);
                rgvProtocol.setErr11(status3[2]);
                rgvProtocol.setErr12(status3[3]);
                boolean[] statusErr = siemensNet.getByteTransform().TransBool(result.Content, 36, 6);
                boolean[] statusErr = siemensNet.getByteTransform().TransBool(result.Content, 36, 5);
                rgvProtocol.setEmergencyStop(statusErr[0]);       // 急停触发
                rgvProtocol.setSlot1EmptyNoData(statusErr[1]);   // 1号位有物无资料
                rgvProtocol.setSlot2EmptyNoData(statusErr[2]);   // 2号位有物无资料
@@ -344,7 +344,7 @@
                rgvProtocol.setConveyorInverterAlarm2(statusErr[34]); // 输送变频器报警 2
                rgvProtocol.setRightConveyor2(statusErr[35]);      // 右输送 2
                rgvProtocol.setLeftConveyor2(statusErr[36]);       // 左输送 2
                if(rgvProtocol.getStatus() == 99){
                if(rgvProtocol.getStatus1() == 99){
                    rgvProtocol.setErrorMk(true);//若存在异常触发写入
                }else{
                    rgvProtocol.setWriteMk(true);//无异常后才能继续写入

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

@@ -170,8 +170,8 @@
    private void readStatus(){
        try {
            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
            OperateResultExOne<byte[]> resultErr = siemensNet.Read("DB64.0", (short) 7);
            if (result.IsSuccess) {
            OperateResultExOne<byte[]> resultErr = siemensNet.Read("DB64.0", (short) 6);
            if (result.IsSuccess && resultErr.IsSuccess) {
                if (null == crnProtocol) {
                    crnProtocol = new CrnProtocol();
                    crnProtocol.setCrnNo(slave.getId());
@@ -200,7 +200,7 @@
                crnProtocol.setyDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));


                boolean[] statusSign = siemensNet.getByteTransform().TransBool(resultErr.Content, 0, 7);
                boolean[] statusSign = siemensNet.getByteTransform().TransBool(resultErr.Content, 0, 6);

                crnProtocol.setIbDriveFault(statusSign[0]);       // 行走变频器故障
                crnProtocol.setIbSupplyFault(statusSign[1]);      // 提供变频器故障

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

@@ -647,6 +647,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

        if(barcodeList.get(0) == 0){
            if(reasultBarcode1.IsSuccess){
@@ -693,6 +694,14 @@
                    barcodeThread.setBarcode(barcode);
                }
            }
            if(reasultBarcode6.IsSuccess){
                Integer barcodeId = barcodeList.get(2);
                String barcode = String.valueOf(siemensS7Net.getByteTransform().TransInt32(reasultBarcode6.Content, 0));
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + +1);
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    barcodeThread.setBarcode(barcode);
                }
            }
        }