#

Junjie

2024-04-18 ebb63d5ac2fb6c822e9d0541d4b86c7d71f21bdb

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

@@ -150,11 +150,33 @@
            return R.error();
        }

        String sourceLoc = null;//源库位
        String targetLoc = null;//任务目标(借用字段)
        String targetSite = param.getShuttleTaskMode();//任务类型(借用字段)
        if (param.getShuttleTaskMode().equals("moveLoc")) {
            //迁移任务
            targetLoc = param.getTargetLocNo();
        } else if (param.getShuttleTaskMode().equals("takeMove")) {
            //取放货任务
            targetLoc = param.getTargetLocNo();
            sourceLoc = param.getSourceLocNo();
        } else if (param.getShuttleTaskMode().equals("reset")) {
            //复位
            Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
                    .eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
                    .eq(Device::getStatus, 1)
                    .eq(Device::getDeviceNo, shuttleNo));
            if (device == null) {
                return R.error("设备不存在");
            }

            ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
            if (shuttleThread == null) {
                return R.error("设备离线");
            }

            shuttleThread.reset(null);
            return R.ok();
        }

        Task task = new Task();
@@ -164,7 +186,7 @@
        task.setTaskCtg(taskCtg.getId());
        task.setPriority(10);
        task.setOriginSite(null);
        task.setOriginLoc(null);
        task.setOriginLoc(sourceLoc);
        task.setDestSite(targetSite);
        task.setDestLoc(targetLoc);
        task.setIoTime(new Date());