Merge branch 'jsxswms' into integrationWms

zhang

4 天以前 af7b9db27bf72c92108329815ec771fb46e5b877

 src/main/java/com/zy/asrs/task/WorkMastScheduler.java

@@ -1,6 +1,8 @@
package com.zy.asrs.task;

import com.zy.asrs.entity.Task;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.TaskService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
@@ -25,6 +27,8 @@
    private WrkMastService wrkMastService;
    @Autowired
    private WorkMastHandler workMastHandler;
    @Autowired
    private TaskService taskService;

    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
@@ -45,4 +49,23 @@
        }
    }

    @Scheduled(cron = "0/3 * * * * ? ")
    private void executeTask(){
        List<Task> wrkMasts = taskService.selectToBeCompleteData();
        if (wrkMasts.isEmpty()) {
            return;
        }
        for (Task wrkMast : wrkMasts) {
            ReturnT<String> returnT = workMastHandler.AgvStart(wrkMast);
            if (!returnT.isSuccess()) {
                wrkMast.setUpdMk("X");
                wrkMast.setErrorMemo(returnT.getMsg());
                wrkMast.setErrorTime(new Date());
                if (!taskService.updateById(wrkMast)) {
                    log.error("工作档[workNo={}]标记待处理失败", wrkMast.getWrkNo());
                }
            }
        }
    }

}