zc
2025-10-22 aa2c08620a28a862da0353233f7163de08cae060
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -205,11 +205,11 @@
                    break;
                case STA_TO_LOC:
                    oriSta = staService.getById(task.getOriSta());
                    if (oriSta.getStaTypeIsCheck() != 1) {
                        if (locStaStatusCheck && !oriSta.getStaSts().equals(StaStsType.STOCK.val())) {
                            throw new BusinessException("oriSta:" + task.getOriSta$() + " is not in STOCK status");
                        }
                    }
//                    if (oriSta.getStaTypeIsCheck() != 1) {
//                        if (locStaStatusCheck && !oriSta.getStaSts().equals(StaStsType.STOCK.val())) {
//                            throw new BusinessException("oriSta:" + task.getOriSta$() + " is not in STOCK status");
//                        }
//                    }
                    oriSta.setStaSts(StaStsType.READY_TAKE.val());
                    oriSta.setUpdateTime(now);
                    if (!staService.updateById(oriSta)) {
@@ -814,9 +814,12 @@
                                    nextDirection = lastDirection;
                                    reverse = true;
                                } else {
                                    if (Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
                                            .equals(TaskPosDto.PosType.ORI_STA)) {
                                    if ((Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
                                            .equals(TaskPosDto.PosType.ORI_STA) || Objects.requireNonNull(TaskPosDto.queryPosType(segment.getPosType()))
                                            .equals(TaskPosDto.PosType.DEST_STA)) && lastCode.getData().equals("00000050")) {
                                        // turn
                                        reverse = false;
                                        actionList.add(new Action(
                                                null,    // 编号s
                                                task.getBusId(),    // 总线
@@ -1098,21 +1101,21 @@
//                                throw new CoolException(agvNo + "号小车方向错误,请推至转弯点手动调整");
//                            }
//
////                            actionList.add(new Action(
////                                    null,    // 编号
////                                    task.getBusId(),    // 总线
////                                    task.getId(),    // 任务
////                                    null,    // 动作号
////                                    null,    // 优先级
////                                    actionType.desc,    // 名称
////                                    (double) agvSpeedType.val,    // 属性值
////                                    lastCode.getData(),    // 地面码
////                                    String.valueOf(gap.getDistance()),   // 动作参数
////                                    actionType.val(),    // 动作类型
////                                    actionPrepareSts,    // 动作进度
////                                    agvId,    // AGV
////                                    now    // 工作时间
////                            ));
//                            actionList.add(new Action(
//                                    null,    // 编号
//                                    task.getBusId(),    // 总线
//                                    task.getId(),    // 任务
//                                    null,    // 动作号
//                                    null,    // 优先级
//                                    actionType.desc,    // 名称
//                                    (double) agvSpeedType.val,    // 属性值
//                                    lastCode.getData(),    // 地面码
//                                    String.valueOf(gap.getDistance()),   // 动作参数
//                                    actionType.val(),    // 动作类型
//                                    actionPrepareSts,    // 动作进度
//                                    agvId,    // AGV
//                                    now    // 工作时间
//                            ));
//                            // turn
//                            actionList.add(new Action(
//                                    null,    // 编号
@@ -1157,11 +1160,11 @@
                                task.getId(),    // 任务
                                null,    // 动作号
                                null,    // 优先级
                                ActionTypeType.ReadyReleaseToConveyorSta.desc,    // 名称
                                staWorkDirection,    // 属性값
                                ActionTypeType.ReadyReleaseToShelvesLoc.desc,    // 名称
                                Double.parseDouble("0"),    // 属性值
                                lastCode.getData(),    // 地面码
                                String.valueOf(destSta.getOffset()),   // 动作参数
                                ActionTypeType.ReadyReleaseToConveyorSta.val(),    // 动作类型
                                ActionTypeType.ReadyReleaseToShelvesLoc.val(),    // 动作类型
                                actionPrepareSts,    // 动作进度
                                agvId,    // AGV
                                now,    // 工作时间