#

zjj

2024-10-09 9c4da646aaefcd8476eb7a23a889b6af6cffab4e

#

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

@@ -254,6 +254,15 @@
                        MotionCtgType.SHUTTLE_MOVE
                ));

                // 锁定目标楼层穿梭车待机位路径
                motionList.addAll(kernelService.mapLockPath(
                        null,
                        MotionDto.build((dto -> {
                            dto.setShuttleNo(shuttleDevice.getId().intValue());
                            dto.setLocNo(standbyLocNoFrom);
                        }))
                ));

                // 提升机空载移动到穿梭车层
                motionList.addAll(kernelService.liftMove(
                        null
@@ -593,6 +602,15 @@
                        MotionCtgType.SHUTTLE_MOVE
                ));

                // 锁定目标楼层穿梭车待机位路径
                motionList.addAll(kernelService.mapLockPath(
                        null,
                        MotionDto.build((dto -> {
                            dto.setShuttleNo(shuttleDevice.getId().intValue());
                            dto.setLocNo(standbyLocNoFrom);
                        }))
                ));

                // 提升机空载移动到穿梭车层
                motionList.addAll(kernelService.liftMove(
                        null

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java

@@ -14,6 +14,7 @@
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
import com.zy.asrs.wcs.rcs.entity.Device;
import com.zy.asrs.wcs.rcs.model.enums.ShuttleProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
import com.zy.asrs.wcs.rcs.service.DeviceService;
@@ -370,6 +371,18 @@
                continue;
            }

            if (shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.OFFLINE)) {
                continue;
            }

            if(!shuttleThread.isDeviceIdle()) {
                continue;
            }

            if(shuttleProtocol.getCurrentLocNo() == null) {
                continue;
            }

            if (Utils.getLev(shuttleProtocol.getCurrentLocNo()) == lev) {
                if (shuttleProtocol.getHasCharge()) {
                    continue;//充电中