#

Junjie

2024-07-13 e27ae18d6b85f11acc78744d9a6cbc4ce0e9c10d

#

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java

@@ -109,15 +109,11 @@
                    command.setComplete(true);
                }

                if (task.getTaskSts() < 100) {//入库判断托盘是否进入提升机
                    if (!liftProtocol.getHasTray()) {
                        return false;
                    }
                } else if (task.getTaskSts() >= 100 && task.getTaskSts() < 200) {//出库判断托盘是否离开提升机
                //判断提升机托盘是否存在
                    if (liftProtocol.getHasTray()) {
                        return false;
                    }
                }

            } else if (command.getMode() == LiftCommandModeType.RESET.id) {
                //复位
                command.setComplete(true);

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

@@ -1,8 +1,6 @@
package com.zy.asrs.wcs.core.kernel;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.core.domain.dto.MotionDto;
import com.zy.asrs.wcs.core.entity.*;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
@@ -53,6 +51,8 @@
    private ShuttleStandbyService shuttleStandbyService;
    @Autowired
    private BasConveyorPathService basConveyorPathService;
    @Autowired
    private BasConveyorStaService basConveyorStaService;
    @Autowired
    private TaskCtgService taskCtgService;

@@ -1404,17 +1404,21 @@

        } else if (destSite.equals("movePallet")) {
            //移动托盘

            BasConveyorSta basConveyorStaOrigin = basConveyorStaService.selectBySiteNo(task.getOriginSite());
            BasConveyorSta basConveyorStaDest = basConveyorStaService.selectBySiteNo(task.getDestSite());
            if(basConveyorStaOrigin == null || basConveyorStaDest == null) {
                return motionList;
            }
            // 提升机移动托盘
            motionList.addAll(kernelService.liftMoveGoods(
                    MotionDto.build((dto -> {
                        dto.setLiftNo(device.getId().intValue());
                        dto.setLev(0);
                        dto.setLev(Utils.getLev(basConveyorStaOrigin.getLocNo()));
                        dto.setStaNo(Integer.parseInt(task.getOriginSite()));
                    }))
                    , MotionDto.build((dto -> {
                        dto.setLiftNo(device.getId().intValue());
                        dto.setLev(0);
                        dto.setLev(Utils.getLev(basConveyorStaDest.getLocNo()));
                        dto.setStaNo(Integer.parseInt(task.getDestSite()));
                    }))
            ));

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

@@ -222,14 +222,9 @@
                    return false;
                }

                if (task.getTaskSts() < 100) {//入库判断托盘是否进入提升机
                    if (!liftProtocol.getHasTray()) {
                        return false;
                    }
                } else if (task.getTaskSts() >= 100 && task.getTaskSts() < 200) {//出库判断托盘是否离开提升机
                //判断提升机托盘是否存在
                    if (liftProtocol.getHasTray()) {
                        return false;
                    }
                }

                if (motion.getReleaseLift() == 1) {//释放提升机

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/NyShuttleThread.java

@@ -212,7 +212,7 @@
                shuttleProtocol.setErrorCode(data.getJSONArray("errCode").getString(0));

                //是否顶升
                shuttleProtocol.setHasLift(data.getInteger("liftPosition") == 1 ? true : false);
                shuttleProtocol.setHasLift(data.getInteger("liftPosition") == 2 ? true : false);
                //是否有托盘
                shuttleProtocol.setHasPallet(data.getInteger("loadState") == 1 ? true : false);
                //行驶方向