#

Junjie

2025-04-15 d56b8093dc9e3e75f8efe1a0f1aa6d821c9c3dfb

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java

@@ -6,6 +6,7 @@
import com.zy.asrs.common.utils.HttpHandler;
import com.zy.asrs.wcs.core.entity.*;
import com.zy.asrs.wcs.core.model.enums.LocStsType;
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.service.*;
import com.zy.asrs.wcs.rcs.News;
@@ -35,6 +36,35 @@
    private LocService locService;
    @Autowired
    private DictService dictService;
    @Autowired
    private BasConveyorStaService basConveyorStaService;

    @Scheduled(cron = "0/1 * * * * ? ")
    @Transactional
    public synchronized void clearCompletedTask2() {
        ArrayList<Long> taskSts = new ArrayList<>();
//        taskSts.add(TaskStsType.COMPLETE_INBOUND.sts);
//        taskSts.add(TaskStsType.COMPLETE_OUTBOUND.sts);
        taskSts.add(TaskStsType.COMPLETE_CHARGE.sts);
        taskSts.add(TaskStsType.COMPLETE_MOVE.sts);
        taskSts.add(TaskStsType.COMPLETE_MANUAL.sts);

        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
                .eq(Task::getStatus, 1)
                .in(Task::getTaskSts, taskSts));
        for (Task task : tasks) {

//            boolean httpRequest = doHttpRequest(task, "127.0.0.1:8080", "/wms/open/asrs//wrkMast/finish/v1");
//            if (!httpRequest) {
//                return;
//            }

            //记录库存信息
            updateRecordLoc(task);
            //任务转历史档
            saveTaskLog(task);
        }
    }

    @Scheduled(cron = "0/1 * * * * ? ")
    @Transactional
@@ -42,9 +72,10 @@
        ArrayList<Long> taskSts = new ArrayList<>();
        taskSts.add(TaskStsType.COMPLETE_INBOUND.sts);
        taskSts.add(TaskStsType.COMPLETE_OUTBOUND.sts);
        taskSts.add(TaskStsType.COMPLETE_CHARGE.sts);
        taskSts.add(TaskStsType.COMPLETE_MOVE.sts);
        taskSts.add(TaskStsType.COMPLETE_MANUAL.sts);
//        taskSts.add(TaskStsType.COMPLETE_CHARGE.sts);
//        taskSts.add(TaskStsType.COMPLETE_MOVE.sts);
//        taskSts.add(TaskStsType.COMPLETE_MANUAL.sts);
        taskSts.add(TaskStsType.COMPLETE_LADEN_MOVE.sts);

        Dict reportWms = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "reportWms"));

@@ -52,6 +83,13 @@
                .eq(Task::getStatus, 1)
                .in(Task::getTaskSts, taskSts));
        for (Task task : tasks) {
            Motion motion = motionService.getOne(new LambdaQueryWrapper<Motion>().eq(Motion::getMotionCtg, MotionCtgType.LIFT_WITH_GOODS.val()).eq(Motion::getTaskNo, task.getTaskNo()));
            if (motion != null) {
                List<BasConveyorSta> conveyorStas = basConveyorStaService.list(new LambdaQueryWrapper<BasConveyorSta>().in(BasConveyorSta::getTaskNo, motion.getTemp()));
                if (!conveyorStas.isEmpty()) {
                    continue;
                }
            }
            if (reportWms != null && reportWms.getValue().equals("true")) {
                //获取WMS地址
                Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "WMS_URL").eq(Dict::getStatus, 1));
@@ -61,11 +99,13 @@
                }
                String wmsUrl = dict.getValue();

                if(task.getTaskSts().equals(TaskStsType.COMPLETE_INBOUND.sts) || task.getTaskSts().equals(TaskStsType.COMPLETE_OUTBOUND.sts)){
                    boolean httpRequest = doHttpRequest(task, wmsUrl, "/open/asrs//wrkMast/finish/v1");
                    if (!httpRequest) {
                        return;
                    }
                if(task.getTaskSts().equals(TaskStsType.COMPLETE_INBOUND.sts)
                        || task.getTaskSts().equals(TaskStsType.COMPLETE_OUTBOUND.sts)
                        || task.getTaskSts().equals(TaskStsType.COMPLETE_LADEN_MOVE.sts)){
//                    boolean httpRequest = doHttpRequest(task, wmsUrl, "/open/asrs/wrkMast/finish/v1");
//                    if (!httpRequest) {
//                        continue;
//                    }
                }
            }