#

Junjie

2024-07-13 5fd478fcee23bbdac0fe4fbe9becdd2a28d14c56

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

@@ -17,6 +17,7 @@
import com.zy.asrs.wcs.core.entity.TaskCtg;
import com.zy.asrs.wcs.core.kernel.AnalyzeService;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.service.BasShuttleService;
import com.zy.asrs.wcs.core.service.MotionService;
@@ -142,7 +143,7 @@

        //获取手动任务类型
        TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
                .eq(TaskCtg::getFlag, "MANUAL")
                .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.MANUAL))
                .eq(TaskCtg::getStatus, 1));
        if (taskCtg == null) {
            return R.error();
@@ -185,12 +186,12 @@
        task.setPriority(10);
        task.setOriginSite(null);
        task.setOriginLoc(sourceLoc);
        task.setDestSite(targetSite);
        task.setDestSite(null);
        task.setDestLoc(targetLoc);
        task.setIoTime(new Date());
        task.setStartTime(new Date());
        task.setStatus(1);
        task.setMemo("manual");
        task.setMemo(targetSite);
        task.setShuttleNo(param.getShuttleNo());

        if (param.getShuttleTaskMode().equals("takeMove")) {