#

Junjie

2024-06-22 4e6d844962ae71bfa593de96e68bae5628ad5ffa

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java

@@ -6,10 +6,7 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.common.SnowflakeIdWorker;
import com.zy.asrs.wcs.core.domain.dto.BasLiftStaDto;
import com.zy.asrs.wcs.core.domain.param.CreateInTaskParam;
import com.zy.asrs.wcs.core.domain.param.CreateManualTakeTaskParam;
import com.zy.asrs.wcs.core.domain.param.CreateMoveTaskParam;
import com.zy.asrs.wcs.core.domain.param.CreateOutTaskParam;
import com.zy.asrs.wcs.core.domain.param.*;
import com.zy.asrs.wcs.core.entity.*;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskCtgType;
@@ -21,6 +18,7 @@
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;
import com.zy.asrs.wcs.rcs.thread.DevpThread;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import com.zy.asrs.wcs.system.controller.BaseController;
import com.zy.asrs.wcs.system.entity.Dict;
@@ -58,6 +56,8 @@
    private BasConveyorPathService basConveyorPathService;
    @Autowired
    private BasLiftService basLiftService;
    @Autowired
    private BasConveyorService basConveyorService;

    //生成入库任务
    @PostMapping("/createInTask")
@@ -321,9 +321,9 @@
        if (shuttleProtocol == null) {
            return R.error("穿梭车不在线");
        }
        if (Utils.getLev(shuttleProtocol.getCurrentLocNo()) != Utils.getLev(param.getDestLoc())) {
            return R.error("穿梭车和目标位置不在同一楼层");
        }
//        if (Utils.getLev(shuttleProtocol.getCurrentLocNo()) != Utils.getLev(param.getDestLoc())) {
//            return R.error("穿梭车和目标位置不在同一楼层");
//        }

        Task one = taskService.getOne(new LambdaQueryWrapper<Task>()
                .eq(Task::getTaskCtg, taskCtg.getId())
@@ -364,4 +364,24 @@
        return R.ok();
    }

    //切换工作模式
    @PostMapping("/switchWorkMode")
    public R switchWorkMode(@RequestBody SwitchWorkModeParam param) {
        BasConveyor basConveyor = basConveyorService.getOne(new LambdaQueryWrapper<BasConveyor>().eq(BasConveyor::getConveyorNo, param.getConveyorNo()));
        if(basConveyor == null) {
            return R.error("输送线不存在");
        }

        DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());
        if(devpThread == null) {
            return R.error("输送线线程不存在");
        }

        boolean result = devpThread.switchWorkMode(param.getSiteId(), param.getWorkMode());
        if (!result) {
            return R.error("模式切换失败");
        }
        return R.ok();
    }

}