#

Junjie

9 天以前 bfd2b9f7dda8688eec86a300c418a8531b5d7326

#

 src/main/java/com/zy/asrs/controller/CrnController.java

@@ -357,8 +357,7 @@
        command.setDestinationPosZ(param.getLev());     // 目标库位层
        staNoProcess(param, command);

        boolean offer = MessageQueue.offer(SlaveType.Crn, param.getCrnNo(), new Task(4, command));
        return offer?R.ok():R.error();
        return crnControl(command)?R.ok():R.error();
    }

    @ManagerAuth(memo = "任务完成")

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -677,7 +677,7 @@
                crnCommand.setDestinationPosX((short) 0);     // 目标库位排
                crnCommand.setDestinationPosY((short) 0);     // 目标库位列
                crnCommand.setDestinationPosZ((short) 0);     // 目标库位层
                if (!MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(4, crnCommand))) {
                if (!MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, crnCommand))) {
                    News.error("堆垛机移动命令下发失败，堆垛机号={}，任务数据={}", crnProtocol.getCrnNo(), JSON.toJSON(crnCommand));
                }
                crnThread.setBackHpFlag(true);

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

@@ -92,9 +92,6 @@
                        command.setDestinationPosZ((short)0);     // 目标库位层
                        write(command);
                        break;
                    case 4://堆垛机移动
                        writeMove((CrnCommand) task.getData());
                        break;
                    default:
                        break;
                }
@@ -361,111 +358,6 @@
            return false;
        }
    }

    /**
     * 写入数据
     */
    private boolean writeMove(CrnCommand command) throws InterruptedException {
        if (null == command) {
            News.error("SiemensCrn"+" - 6"+" - 堆垛机写入命令为空");
            return false;
        }

//        int writeAck = 0;
//        do {
//            OperateResult resultAck = siemensNet.Write("DB100.0", (short) 0);
//            if (resultAck.IsSuccess){
//                Thread.sleep(200);
//                OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 2);
//                short ack = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
//                if (ack != 0) {
//                    writeAck++;
//                }else {
//                    News.info("堆垛机命令下发[id:{}] >>>>> {}", slave.getId(), "ack复位完成");
//                    break;
//                }
//            }
//        }while (writeAck <5);

//        convertRow(command);
        command.setCrnNo(slave.getId());
        short[] array = new short[4];
        array[0] = command.getSourcePosX();
        array[1] = command.getSourcePosY();
        array[2] = command.getSourcePosZ();
        array[3] = command.getTaskMode();

        OperateResult result = null;
        int idx = 0;
        do {
            OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.26", (short) 2);
            if (resultRead.IsSuccess) {
                short posY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
                if(posY == 0) {
                    result = siemensNet.Write("DB100.24", array);
                }else {
                    break;
                }
            }
            idx++;
            Thread.sleep(500L);
        } while (idx < 5);

        if (command.getAckFinish() == 0) {
            short commandFinish = 1;
            int i = 0;
            do {
                OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.26", (short) 2);
                OperateResultExOne<byte[]> resultReadConfirm = siemensNet.Read("DB100.22", (short) 2);
                if (resultRead.IsSuccess && resultReadConfirm.IsSuccess) {
                    short posY = siemensNet.getByteTransform().TransInt16(resultRead.Content, 0);
                    short confirm = siemensNet.getByteTransform().TransInt16(resultReadConfirm.Content, 0);
                    if(posY != 0 && confirm == 0) {
                        result = siemensNet.Write("DB100.22", commandFinish);
                    }
                }
                i++;
                Thread.sleep(500L);
            } while (i < 5);
        }

        this.crnProtocol.setLastCommandTime(System.currentTimeMillis());
        try {
            // 日志记录
            BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
            BasCrnOpt basCrnOpt = new BasCrnOpt(
                    command.getTaskNo().intValue(),    // 任务号
                    command.getCrnNo(),    // 堆垛机[非空]
                    new Date(),    // 下发时间
                    command.getTaskModeType().toString(),    // 模式
                    command.getSourcePosX().intValue(),    // 源排
                    command.getSourcePosY().intValue(),    // 源列
                    command.getSourcePosZ().intValue(),    // 源层
                    null,    // 源站
                    command.getDestinationPosX().intValue(),    // 目标排
                    command.getDestinationPosY().intValue(),    // 目标列
                    command.getDestinationPosZ().intValue(),    // 目标层
                    null,    // 目标站
                    null,    // 响应结果
                    null,    // 修改时间
                    null    // 修改人员
            );
            bean.insert(basCrnOpt);
        } catch (Exception ignore) {}

        if (result != null && result.IsSuccess) {
            Thread.sleep(200);
            this.readStatus();
            News.info("SiemensCrn"+" - 7"+" - 堆垛机命令下发[id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】[id:{1}] >>>>> 命令下发： {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
            return true;
        } else {
            OutputQueue.CRN.offer(MessageFormat.format("【{0}】写入堆垛机plc数据失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            News.error("SiemensCrn"+" - 8"+" - 写入堆垛机plc数据失败 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            return false;
        }
    }


    @Override
    public void close() {