#

Junjie

2024-10-17 d62c5c0eb2e28b7bf27d23de84a609b5a2e415e4

#

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java

@@ -76,9 +76,9 @@
    private Integer sync;

    /**
     * 执行完成后是否释放提升机，默认不释放  1: 释放  0: 不释放
     * 执行完成后是否释放提升机，默认不释放 2:执行中释放 1: 释放  0: 不释放
     */
    @ApiModelProperty(value= "执行完成后是否释放提升机，默认不释放  1: 释放  0: 不释放")
    @ApiModelProperty(value= "执行完成后是否释放提升机，默认不释放 2:执行中释放 1: 释放  0: 不释放")
    private Integer releaseLift;

    /**

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java

@@ -206,6 +206,7 @@
                            dto.setShuttleNo(shuttleDevice.getId().intValue());
                            dto.setLiftNo(transferLiftDevice.getId().intValue());
                            dto.setLocNo(destLoc);
                            dto.setReleaseLift(2);//执行中释放提升机
                        })),
                        MotionCtgType.SHUTTLE_TRANSPORT
                ));
@@ -381,6 +382,7 @@
                            dto.setShuttleNo(shuttleDevice.getId().intValue());
                            dto.setLiftNo(transferLiftDevice.getId().intValue());
                            dto.setLocNo(destLoc);
                            dto.setReleaseLift(2);//执行中释放提升机
                        })),
                        MotionCtgType.SHUTTLE_TRANSPORT
                ));

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java

@@ -317,6 +317,10 @@
                motion.setReleaseShuttle(target.getReleaseShuttle());
            }

            if (target.getReleaseLift() != null) {
                motion.setReleaseLift(target.getReleaseLift());
            }

        }));

        return motionList;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java

@@ -136,6 +136,15 @@
                }
                shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.DFX.id, assignCommand, shuttleThread);
                shuttleTaskModeType = ShuttleTaskModeType.TRANSPORT;

                if (motion.getReleaseLift() == 2) {//执行中释放提升机
                    task.setLiftNo(0);
                    task.setUpdateTime(new Date());
                    if (!taskService.updateById(task)) {
                        return false;
                    }
                }

                break;
            case SHUTTLE_TRANSPORT_TO_CONVEYOR://穿梭车载货进输送线
                BasConveyorSta originStaObj = basConveyorStaService.selectBySiteNo(motion.getDockNo());//获取输送站点