Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

LSH

2023-12-02 e4d5a0e37babc1ae214c34162e58f5084927d301

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

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

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.TaskWrkService;
@@ -13,6 +13,8 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.List;

/**
 * 定时将任务(完成、取消)转成日志
@@ -35,14 +37,14 @@
    public void execute() {
        for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
            TaskStatusFeedbackParam taskStatusFeedbackParam = new TaskStatusFeedbackParam(taskWrk);
            if (taskWrk.getStatus()==3){
            if (taskWrk.getStatus().equals(TaskStatusType.COMPLETE.id)) {//完成
                taskStatusFeedbackParam.setTaskStatus("done");
                new PostMesDataUtils().postMesData("完成上报",wmsUrl,movePath,taskWrk);
            }else {
            } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
                taskStatusFeedbackParam.setTaskStatus("cancelled");
                new PostMesDataUtils().postMesData("取消任务完成",wmsUrl,movePath,taskWrk);

            }

            if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
                //任务已经转日志，将该任务下面的指令转日志
                commandInfoService.saveToHistory(taskWrk.getTaskNo());