联调

dubin

2025-08-21 73cf8ac847af5a3c22e83f64e92692e31e4576d0

联调

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

@@ -3212,10 +3212,13 @@

            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {

                if ((crnProtocol.getCrnNo()==3 || crnProtocol.getCrnNo()==4) && crnProtocol.getBay()==0 && crnProtocol.getLevel() == 1) {
                    continue;
                }
                if ((crnProtocol.getCrnNo()==1 || crnProtocol.getCrnNo()==2) && crnProtocol.getBay()==1 && crnProtocol.getLevel() == 1) {
//                if ((crnProtocol.getCrnNo()==3 || crnProtocol.getCrnNo()==4) && crnProtocol.getBay()==0 && crnProtocol.getLevel() == 1) {
//                    continue;
//                }
//                if ((crnProtocol.getCrnNo()==1 || crnProtocol.getCrnNo()==2) && crnProtocol.getBay()==1 && crnProtocol.getLevel() == 1) {
//                    continue;
//                }
                if (crnProtocol.getCrnNo()==1 && crnProtocol.getBay()==1 && crnProtocol.getLevel() == 1) {
                    continue;
                }
                Page<BasCrnOpt> basCrnOptPage = crnOptService.selectPage(new Page<>(1, 1), new EntityWrapper<BasCrnOpt>().eq("crn_no", crn.getId()).orderBy("send_time", false));
@@ -3241,19 +3244,19 @@
                News.info("堆垛机无任务自动回入库口待机==>>" + crnProtocol.getCrnNo() + "号堆垛机");
                // 命令下发区 --------------------------------------------------------------------------
                CrnCommand crnCommand = new CrnCommand();
                if (crnProtocol.getCrnNo()==3 || crnProtocol.getCrnNo()==4){
                    crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号
                    crnCommand.setTaskNo((short) 9999); // 工作号
                    crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                    crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 任务模式:  堆垛机移动
                    crnCommand.setSourcePosX(crnStn.getRow().shortValue());     // 源库位排
                    crnCommand.setSourcePosY((short) 0);     // 源库位列
                    crnCommand.setSourcePosZ((short) 1);     // 源库位层
                    crnCommand.setDestinationPosX((short) 0);     // 目标库位排
                    crnCommand.setDestinationPosY((short) 0);     // 目标库位列
                    crnCommand.setDestinationPosZ((short) 0);     // 目标库位层
                    crnCommand.setCommand((short) 1);
                }else {
//                if (crnProtocol.getCrnNo()==3 || crnProtocol.getCrnNo()==4){
//                    crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号
//                    crnCommand.setTaskNo((short) 9999); // 工作号
//                    crnCommand.setAckFinish((short) 0);  // 任务完成确认位
//                    crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 任务模式:  堆垛机移动
//                    crnCommand.setSourcePosX(crnStn.getRow().shortValue());     // 源库位排
//                    crnCommand.setSourcePosY((short) 0);     // 源库位列
//                    crnCommand.setSourcePosZ((short) 1);     // 源库位层
//                    crnCommand.setDestinationPosX((short) 0);     // 目标库位排
//                    crnCommand.setDestinationPosY((short) 0);     // 目标库位列
//                    crnCommand.setDestinationPosZ((short) 0);     // 目标库位层
//                    crnCommand.setCommand((short) 1);
//                }else {
                    crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号
                    crnCommand.setTaskNo((short) 9999); // 工作号
                    crnCommand.setAckFinish((short) 0);  // 任务完成确认位
@@ -3265,7 +3268,7 @@
                    crnCommand.setDestinationPosY((short) 0);     // 目标库位列
                    crnCommand.setDestinationPosZ((short) 0);     // 目标库位层
                    crnCommand.setCommand((short) 1);
                }
//                }
                if (!MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, crnCommand))) {
                    News.error("堆垛机移动命令下发失败，堆垛机号={}，任务数据={}", crnProtocol.getCrnNo(), JSON.toJSON(crnCommand));
                }

 src/main/java/com/zy/core/model/protocol/CrnProtocol.java

@@ -187,6 +187,11 @@
     */
    public Float yDuration;

    /**
     * 上一次指令下发时间
     */
    private Long lastCommandTime = System.currentTimeMillis();

    public void setMode(Short mode) {
        this.mode = mode;
        this.modeType = CrnModeType.get(mode);

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -100,12 +100,6 @@
    private Boolean contactErr = false; //电机接触器故障

    private Boolean upcontactErr = false; //顶升电机接触器故障

    /**
     * 上一次指令下发时间
     */
    private Long lastCommandTime = System.currentTimeMillis();

    public Boolean isErr(){
        if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){
            return true;