Merge remote-tracking branch 'origin/jx-fyxc-wcs' into jx-fyxc-wcs

zc

4 天以前 c19bd47fa2f5aa779f902d599b51824741bda6f0

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

@@ -91,6 +91,12 @@
                        command.setDestinationPosZ((short)0);     // 目标库位层
                        write(command);
                        break;
                    case 4://恢复联机
                        writeResume();
                        break;
                    case 5://取消任务
                        writeCancel();
                        break;
                    default:
                        break;
                }
@@ -235,6 +241,22 @@
        }
    }

    private boolean writeResume() throws InterruptedException {
        OperateResult write = siemensNet.Write("DB100.22", (short) 1);
        if (write.IsSuccess) {
            return true;
        }
        return false;
    }

    private boolean writeCancel() throws InterruptedException {
        OperateResult write = siemensNet.Write("DB100.20", (short) 1);
        if (write.IsSuccess) {
            return true;
        }
        return false;
    }

    /**
     * 写入数据
     */
@@ -285,10 +307,8 @@
        array[9] = command.getCommand();
//        array[10] = 0;   //备用1

        boolean[] array2 = new boolean[1];
        array2[0] = command.isTraySize();

        OperateResult result = siemensNet.Write("DB100.0", array);
        OperateResult result2 = siemensNet.Write("DB100.22", array2);
        News.info("堆垛机命令下发[id:{}] >>>>> {}", slave.getId(), array);

        //堆垛机任务写入后，回读一次，看是否成功
@@ -297,11 +317,10 @@

        do {
            try{
                if(!result.IsSuccess || !result2.IsSuccess){
                if(!result.IsSuccess ){
                    News.error("写入堆垛机plc数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
//                    MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
                    result = siemensNet.Write("DB100.0", array);
                    result2 = siemensNet.Write("DB100.22", array2);
                    Thread.sleep(100);
                    writeCount1++;
                    continue;
@@ -344,7 +363,6 @@
//                            MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
                        News.error("写入堆垛机plc数据失败，重新下发任务  回读不一致 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
                        result = siemensNet.Write("DB100.0", array);
                        result2 = siemensNet.Write("DB100.22", array2);
                        writeCount1++;
                        continue;