#

zjj

2023-12-08 d04ce586afce3b78f238289dad10dacd4c22206a

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

@@ -213,7 +213,7 @@
            }
        }

        Thread.sleep(200);
        //Thread.sleep(200);
        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
        if (result1.IsSuccess) {
            for (int i = 0; i < staNoSize; i++) {
@@ -238,7 +238,7 @@

        if (slave.getId() == 1){
            //条码
            Thread.sleep(200);
            //Thread.sleep(200);
            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.102",(short)60);
            if (result2.IsSuccess) {
                for (int i = 0; i < 6; i++) {
@@ -251,7 +251,7 @@
            }

            // 外形检测 - 102
            Thread.sleep(100);
            //Thread.sleep(100);
            OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.160", (short)1);
            if (result4.IsSuccess) {
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result4.Content, 0, 1);
@@ -265,7 +265,7 @@
                staProtocol.setBarcodeErr(status[6]);
            }
            // 外形检测 - 107
            Thread.sleep(50);
            //Thread.sleep(50);
            OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB101.164", (short)1);
            if (result5.IsSuccess) {
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result5.Content, 0, 1);
@@ -279,7 +279,7 @@
                staProtocol.setBarcodeErr(status[6]);
            }
            // 外形检测 - 111
            Thread.sleep(50);
            //Thread.sleep(50);
            OperateResultExOne<byte[]> result6 = siemensS7Net.Read("DB101.168", (short)1);
            if (result6.IsSuccess) {
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result6.Content, 0, 1);
@@ -293,7 +293,7 @@
                staProtocol.setBarcodeErr(status[6]);
            }
            // 外形检测 - 115
            Thread.sleep(50);
            //Thread.sleep(50);
            OperateResultExOne<byte[]> result7 = siemensS7Net.Read("DB101.172", (short)1);
            if (result7.IsSuccess) {
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result7.Content, 0, 1);
@@ -307,7 +307,7 @@
                staProtocol.setBarcodeErr(status[6]);
            }
            // 外形检测 - 119
            Thread.sleep(50);
            //Thread.sleep(50);
            OperateResultExOne<byte[]> result8 = siemensS7Net.Read("DB101.176", (short)1);
            if (result8.IsSuccess) {
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result8.Content, 0, 1);
@@ -321,7 +321,7 @@
                staProtocol.setBarcodeErr(status[6]);
            }
            // 外形检测 - 123
            Thread.sleep(50);
            //Thread.sleep(50);
            OperateResultExOne<byte[]> result9 = siemensS7Net.Read("DB101.180", (short)1);
            if (result9.IsSuccess) {
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result9.Content, 0, 1);
@@ -336,7 +336,7 @@
            }
        } else if (slave.getId() == 3) {
            // 外形检测 - 111
            Thread.sleep(50);
            //Thread.sleep(50);
            OperateResultExOne<byte[]> result10 = siemensS7Net.Read("DB101.26", (short)1);
            if (result10.IsSuccess) {
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result10.Content, 0, 1);
@@ -645,12 +645,12 @@
//                        commandInfoLogService.insert(commandInfoLog);

                        //更新任务步序
                        TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
                        TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue());
                        if (taskWrk != null) {
                            taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//更新指令步序
                            taskWrkService.updateById(taskWrk);
                        }
//                        TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
//                        TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue());
//                        if (taskWrk != null) {
//                            taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//更新指令步序
//                            taskWrkService.updateById(taskWrk);
//                        }

                        break;
                    } else {//返回结果是成功了，但是真实值不相同