#改造

cpT

2025-07-01 852a6cc97fadbcc5538d14e2667ddb663767e7aa

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

@@ -137,31 +137,55 @@
                        back = true;
                    }
                    if (staProtocol.isFrontErr()) {
                        errMsg = "前超限";
                        if (!back){
                            errMsg = "前超限";
                        } else {
                            errMsg = errMsg+"---"+"前超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isBackErr()) {
                        errMsg = "后超限";
                    if (staProtocol.isBackErr()) {
                        if (!back){
                            errMsg = "后超限";
                        } else {
                            errMsg = errMsg+"---"+"后超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isHighErr()) {
                        errMsg = "高超限";
                    if (staProtocol.isHighErr()) {
                        if (!back){
                            errMsg = "高超限";
                        } else {
                            errMsg = errMsg+"---"+"高超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isLeftErr()) {
                        errMsg = "左超限";
                    if (staProtocol.isLeftErr()) {
                        if (!back){
                            errMsg = "左超限";
                        } else {
                            errMsg = errMsg+"---"+"左超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isRightErr()) {
                        errMsg = "右超限";
                    if (staProtocol.isRightErr()) {
                        if (!back){
                            errMsg = "右超限";
                        } else {
                            errMsg = errMsg+"---"+"右超限";
                        }
                        back = true;
                    }
//                    if (!back && staProtocol.isWeightErr()) {
//                        errMsg = "超重";
//                        back = true;
//                    }
                    if (!back && staProtocol.isBarcodeErr()) {
                        errMsg = "扫码失败";
                    if (staProtocol.isBarcodeErr()) {
                        if (!back){
                            errMsg = "扫码失败";
                        } else {
                            errMsg = errMsg+"---"+"扫码失败";
                        }
                        back = true;
                    }
                    // 退回
@@ -644,6 +668,9 @@
            }

            CrnSlave crnSlave = new CrnSlave(crn);
            if (Cools.isEmpty(crnProtocol.getLaneNo()) || crnProtocol.getLaneNo()==0){
                continue;
            }

            if (!crn.getId().equals(crnProtocol.getLaneNo())) {
                for (CrnSlave crnOther : slaveProperties.getCrn()) {
@@ -751,7 +778,7 @@
                        // 命令下发区 --------------------------------------------------------------------------
                        CrnCommand crnCommand = new CrnCommand();
                        crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号
                        crnCommand.setCrnNo(crnProtocol.getLaneNo()); // 堆垛机巷道编号
                        crnCommand.setLaneNo(crnProtocol.getLaneNo()); // 堆垛机巷道编号
                        crnCommand.setTaskNo((short)999); // 工作号
                        crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                        crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 任务模式:  库位移转
@@ -804,6 +831,9 @@
            }

            CrnSlave crn = new CrnSlave(crnSlave);
            if (Cools.isEmpty(crnProtocol.getLaneNo()) || crnProtocol.getLaneNo()==0){
                continue;
            }

            if (!crnSlave.getId().equals(crnProtocol.getLaneNo())) {
                for (CrnSlave crnOther : slaveProperties.getCrn()) {
@@ -960,7 +990,7 @@
                // 命令下发区 --------------------------------------------------------------------------
                CrnCommand crnCommand = new CrnCommand();
                crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
                crnCommand.setCrnNo(crnProtocol.getLaneNo()); // 堆垛机巷道编号
                crnCommand.setLaneNo(crnProtocol.getLaneNo()); // 堆垛机巷道编号
                crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 工作号
                crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转
@@ -1305,6 +1335,9 @@
                }

                CrnSlave crn = new CrnSlave(crnSlave);
                if (Cools.isEmpty(crnProtocol.getLaneNo()) || crnProtocol.getLaneNo()==0){
                    continue;
                }

                if (!crnSlave.getId().equals(crnProtocol.getLaneNo())) {
                    for (CrnSlave crnOther : slaveProperties.getCrn()) {
@@ -1324,11 +1357,14 @@
                    }
//                Thread.sleep(300);
                    //确认完成信号
                    CrnOperatorParam crnOperatorParam = new CrnOperatorParam();
                    crnOperatorParam.setCrnNo(crn.getId());
//                    CrnOperatorParam crnOperatorParam = new CrnOperatorParam();
//                    crnOperatorParam.setCrnNo(crn.getId());
                    Date now = new Date();

                    crnController.crnTaskComplete(crnOperatorParam);
//                    crnController.crnTaskComplete(crnOperatorParam);
//                    MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))
                    crnThread.setResetFlag(true);

                    if (!Cools.isEmpty(taskWrk)) {
                        if (taskWrk.getIoType() == 1 && taskWrk.getWrkSts() == 3) {
                            taskWrk.setWrkSts(4);//入库完成
@@ -1499,8 +1535,8 @@
                                        null,    // 结束时间
                                        null,    // 工作状态
                                        null,    // 入出库类型
                                        crn.getId(),    // 堆垛机
                                        null,    // plc
                                        crnProtocol.getLaneNo(),    // 堆垛机
                                        crn.getId(),    // plc
                                        null,    // 目标库位
                                        null,    // 目标站
                                        null,    // 源站
@@ -1857,6 +1893,15 @@
                if (staProtocol.getSiteId() == 1004 || staProtocol.getSiteId()==1020){
                    // 判断是否满足取货条件
                    if (!staProtocol.isLoading()) {
                        devpThread.setErrorDev(staProtocol.getSiteId(), "无物");
                        return null;
                    }
                    if (!staProtocol.isInEnable()) {
                        devpThread.setErrorDev(staProtocol.getSiteId(), "等待可入信号");
                        return null;
                    }
                    if (!staProtocol.isStaOk()) {
                        devpThread.setErrorDev(staProtocol.getSiteId(), "等待链条就绪");
                        return null;
                    }
                    // 尺寸检测异常
@@ -1867,31 +1912,55 @@
                        back = true;
                    }
                    if (staProtocol.isFrontErr()) {
                        errMsg = "前超限";
                        if (!back){
                            errMsg = "前超限";
                        } else {
                            errMsg = errMsg+"---"+"前超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isBackErr()) {
                        errMsg = "后超限";
                    if (staProtocol.isBackErr()) {
                        if (!back){
                            errMsg = "后超限";
                        } else {
                            errMsg = errMsg+"---"+"后超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isHighErr()) {
                        errMsg = "高超限";
                    if (staProtocol.isHighErr()) {
                        if (!back){
                            errMsg = "高超限";
                        } else {
                            errMsg = errMsg+"---"+"高超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isLeftErr()) {
                        errMsg = "左超限";
                    if (staProtocol.isLeftErr()) {
                        if (!back){
                            errMsg = "左超限";
                        } else {
                            errMsg = errMsg+"---"+"左超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isRightErr()) {
                        errMsg = "右超限";
                    if (staProtocol.isRightErr()) {
                        if (!back){
                            errMsg = "右超限";
                        } else {
                            errMsg = errMsg+"---"+"右超限";
                        }
                        back = true;
                    }
//                    if (!back && staProtocol.isWeightErr()) {
//                        errMsg = "超重";
//                        back = true;
//                    }
                    if (!back && staProtocol.isBarcodeErr()) {
                        errMsg = "扫码失败";
                    if (staProtocol.isBarcodeErr()) {
                        if (!back){
                            errMsg = "扫码失败";
                        } else {
                            errMsg = errMsg+"---"+"扫码失败";
                        }
                        back = true;
                    }
                    // 退回
@@ -1918,6 +1987,7 @@
                        }
                        return null;
                    }
                    return null;
                }
                return taskWrk;
            }