日志

Junjie

2023-08-11 5ede6d1ba71a47fa33034d6e815681f218d61ff9

日志

 src/main/java/com/zy/asrs/mapper/CommandInfoMapper.java

@@ -14,4 +14,8 @@
    List<CommandInfo> selectByTaskNoAndWrkNo(String taskNo, Integer wrkNo);

    List<CommandInfo> selectByWrkNo(Integer wrkNo);

    List<CommandInfo> selectByTaskNo(String taskNo);

    int saveToHistory(String taskNo);//将指令转日志
}

 src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java

@@ -23,4 +23,8 @@

    WrkMast selectCrnWorking(@Param("crnNo") Integer crnNo);

    List<TaskWrk> selectToBeHistoryData();

    int saveToHistory(String taskNo);//将任务转历史日志

}

 src/main/java/com/zy/asrs/service/CommandInfoService.java

@@ -11,4 +11,8 @@

    List<CommandInfo> selectByWrkNo(Integer wrkNo);

    List<CommandInfo> selectByTaskNo(String taskNo);

    int saveToHistory(String taskNo);//将指令转日志

}

 src/main/java/com/zy/asrs/service/TaskWrkService.java

@@ -3,6 +3,8 @@
import com.zy.asrs.entity.TaskWrk;
import com.baomidou.mybatisplus.service.IService;

import java.util.List;

public interface TaskWrkService extends IService<TaskWrk> {

    TaskWrk selectByTaskNo(String taskNo);
@@ -21,4 +23,8 @@
    //库位移转
    void locMove(TaskWrk taskWrk, Long userId);

    List<TaskWrk> selectToBeHistoryData();

    int saveToHistory(String taskNo);//将任务转历史日志

}

 src/main/java/com/zy/asrs/service/impl/CommandInfoServiceImpl.java

@@ -20,4 +20,17 @@
    public List<CommandInfo> selectByWrkNo(Integer wrkNo) {
        return this.baseMapper.selectByWrkNo(wrkNo);
    }

    @Override
    public List<CommandInfo> selectByTaskNo(String taskNo) {
        return this.baseMapper.selectByTaskNo(taskNo);
    }

    @Override
    public int saveToHistory(String taskNo) {
        if (this.selectByTaskNo(taskNo).isEmpty()) {
            return 0;
        }
        return this.baseMapper.saveToHistory(taskNo);
    }
}

 src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java

@@ -13,6 +13,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
import java.util.List;

@Service("taskWrkService")
public class TaskWrkServiceImpl extends ServiceImpl<TaskWrkMapper, TaskWrk> implements TaskWrkService {
@@ -93,4 +94,14 @@
        taskWrk.setModiUser(userId);
        updateById(taskWrk);
    }

    @Override
    public List<TaskWrk> selectToBeHistoryData() {
        return this.baseMapper.selectToBeHistoryData();
    }

    @Override
    public int saveToHistory(String taskNo) {
        return this.baseMapper.saveToHistory(taskNo);
    }
}

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

New file
@@ -0,0 +1,41 @@
package com.zy.asrs.task;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.TaskWrkService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

/**
 * 定时将任务(完成、取消)转成日志
 */
@Slf4j
@Component
public class TaskLogScheduler {

    @Autowired
    private TaskWrkService taskWrkService;
    @Autowired
    private CommandInfoService commandInfoService;

    @Scheduled(cron = "0/3 * * * * ? ")
    public void execute() {
        for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
            if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
                //任务已经转日志，将该任务下面的指令转日志
                commandInfoService.saveToHistory(taskWrk.getTaskNo());

                //删除任务
                taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
                //删除指令
                commandInfoService.delete(new EntityWrapper<CommandInfo>().eq("task_no", taskWrk.getTaskNo()));
            }
        }
    }

}

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

File was deleted

 src/main/resources/mapper/CommandInfoMapper.xml

@@ -29,4 +29,13 @@
        where wrk_no = #{wrkNo}
    </select>

    <select id="selectByTaskNo" resultMap="BaseResultMap">
        select * from wcs_command_info
        where task_no = #{taskNo}
    </select>

    <insert id="saveToHistory">
        insert into wcs_command_info_log select * from wcs_command_info where task_no = #{taskNo}
    </insert>

</mapper>

 src/main/resources/mapper/TaskWrkMapper.xml

@@ -65,4 +65,15 @@
        order by io_pri desc,create_time,wrk_no ASC
    </select>

    <select id="selectToBeHistoryData" resultMap="BaseResultMap">
        select * from dbo.wcs_task_wrk
        where 1=1
        and (status=3 or status=4)
        order by io_pri desc,create_time,wrk_no ASC
    </select>

    <insert id="saveToHistory">
        insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo} and (status=3 or status=4)
    </insert>

</mapper>