#改造

cpT

2025-07-01 d0cd998f775255ad1ba89f5cd60ed3eb89e00404

 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.getLoaded()) || crnProtocol.getLoaded()==0){
                continue;
            }

            if (!crn.getId().equals(crnProtocol.getLaneNo())) {
                for (CrnSlave crnOther : slaveProperties.getCrn()) {
@@ -804,6 +831,9 @@
            }

            CrnSlave crn = new CrnSlave(crnSlave);
            if (Cools.isEmpty(crnProtocol.getLoaded()) || crnProtocol.getLoaded()==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.getLoaded()) || crnProtocol.getLoaded()==0){
                    continue;
                }

                if (!crnSlave.getId().equals(crnProtocol.getLaneNo())) {
                    for (CrnSlave crnOther : slaveProperties.getCrn()) {
@@ -1452,8 +1485,8 @@
                                        null,    // 结束时间
                                        taskWrk.getWrkSts().longValue(),    // 工作状态
                                        taskWrk.getIoType(),    // 入出库类型
                                        crn.getId(),    // 堆垛机
                                        null,    // plc
                                        taskWrk.getCrnNo(),    // 巷道号
                                        crn.getId(),    // 堆垛机号
                                        taskWrk.getTargetPoint(),    // 目标库位
                                        0,    // 目标站
                                        0,    // 源站
@@ -1867,31 +1900,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;
                    }
                    // 退回
@@ -2331,7 +2388,7 @@
                log.error("任务生成失败===》异常信息：{}", e.getMessage());
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "指令生成失败：异常信息"+e.getMessage());
                    deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "指令生成失败");
                } catch (Exception e2){
                }
            }
@@ -2435,7 +2492,7 @@

                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "任务生成失败issued1：异常信息"+e.getMessage());
                    deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "任务生成失败issued1");
                } catch (Exception e2){
                }
                return false;
@@ -2459,7 +2516,7 @@

            try{
                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "站点任务生成失败issued2：异常信息"+e.getMessage());
                deviceErrorService.addDeviceError("rgvErr", rgvSlave.getId(), "站点任务生成失败issued2");
            } catch (Exception e2){
            }
        }