no message

skyouc

6 天以前 e046dba174365eb8934ee1e4206f09821145e876

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java

@@ -15,10 +15,13 @@
import com.zy.asrs.wms.apis.wcs.entity.request.TaskDescribe;

import com.zy.asrs.wms.apis.wcs.entity.request.TaskParam;

import com.zy.asrs.wms.apis.wcs.entity.response.CommonReponse;

import com.zy.asrs.wms.asrs.entity.Task;

import com.zy.asrs.wms.asrs.entity.*;

import com.zy.asrs.wms.asrs.entity.dto.OrderOutMergeDto;

import com.zy.asrs.wms.asrs.entity.enums.LocStsType;

import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;

import com.zy.asrs.wms.asrs.service.TaskService;

import com.zy.asrs.wms.asrs.service.WorkService;

import com.zy.asrs.wms.asrs.service.*;

import com.zy.asrs.wms.asrs.service.impl.LocServiceImpl;

import com.zy.asrs.wms.utils.Utils;

import lombok.extern.slf4j.Slf4j;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.http.HttpEntity;

@@ -49,9 +52,22 @@
    private RestTemplate restTemplate;

    @Autowired

    private WorkService workService;



    @Resource

    private SystemProperties properties;

    @Autowired

    private LocServiceImpl locService;

    @Autowired

    private LocDetlService locDetlService;

    @Autowired

    private TaskDetlService taskDetlService;

    @Autowired

    private LocDetlFieldService locDetlFieldService;

    @Autowired

    private TaskDetlFieldService taskDetlFieldService;

    @Autowired

    private CacheSiteService cacheSiteService;

    @Autowired

    private OperationPortService operationPortService;



    /***

     * 入库任务---通知ESS输送线流动

@@ -60,7 +76,8 @@
    @Transactional(rollbackFor = Exception.class)

    public void conveyorStart() {

        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()

                .eq(Task::getTaskSts, TaskStsType.WCS_CONTAINER_RECEIVE.id).eq(Task::getStatus, 1));

                .eq(Task::getTaskSts, TaskStsType.WCS_CONTAINER_RECEIVE.id)

                .eq(Task::getStatus, 1));

        tasks.forEach(task -> {

            try {

                ConveyorStarParam conveyorStarParam = new ConveyorStarParam();

@@ -71,6 +88,7 @@
                log.info("通知ESS输送线流动请求地址：{}，请求参数：{}", "http://192.168.2.200:9046/conveyor/moveContainer", JSONObject.toJSONString(conveyorStarParam));

                HttpHeaders headers = new HttpHeaders();

                headers.add("Content-Type", "application/json");

                headers.add("api-version", "v2.0");

                HttpEntity httpEntity = new HttpEntity<>(conveyorStarParam, headers);

                // 调用三方接口，将任务推送至ESS平台

                ResponseEntity<String> exchange = restTemplate.exchange("http://192.168.2.200:9046/conveyor/moveContainer", HttpMethod.POST, httpEntity, String.class);

@@ -92,14 +110,82 @@
                }

            } catch (Exception ex) {

                log.error(ex.getMessage());

            } finally {

                //如果异常修改禁用状态

               // taskService.update(new LambdaUpdateWrapper<Task>().set(Task::getStatus, 0).eq(Task::getId, task.getId()));

            }

        });



    }



    /**

     * 生成自动盘点任务

     */

//    @Scheduled(cron = "0/50 * * * * ?")

//    @Transactional(rollbackFor = Exception.class)

    public void genCheckTask() {

        Loc locs = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocStsId, LocStsType.F.val()).orderByAsc(Loc::getLocNo).last("limit 1"));

        if (Objects.isNull(locs)) {

            return;

        }

        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().select(Task::getId).eq(Task::getTaskType, 107L));

        if (!tasks.isEmpty() && tasks.size() >= 4) {

            //默认生成四个盘点任务，超过4个，停止生成盘点任务;

            return;

        }

        OperationPort operationPort = operationPortService.getOne(new LambdaQueryWrapper<OperationPort>().last("ORDER BY RAND() LIMIT 1;"));

        if (operationPort == null || Objects.isNull(operationPort)) {

            throw new CoolException("作业口不存在");

        }

        Task task = new Task();

        task.setTaskNo(workService.generateTaskNo(TaskStsType.GENERATE_OUT.id));

        task.setTaskSts(TaskStsType.GENERATE_OUT.id);

        task.setTaskType(107L); //默认107盘点任务，盘点任务没有，按103处理

        task.setIoPri(workService.generateIoPri(TaskStsType.GENERATE_OUT.id));

        task.setOriginLoc(locs.getLocNo());

        task.setTargetSite(operationPort.getFlag());

        task.setBarcode(locs.getBarcode());



        if (!taskService.save(task)) {

            throw new CoolException("任务生成失败！！");

        }



        List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocId, locs.getId()));

        if (locDetls.isEmpty()) {

            throw new CoolException("明细不存在！！");

        }



        for (LocDetl locDetl : locDetls) {

            TaskDetl taskDetl = new TaskDetl();

            taskDetl.sync(locDetl);

            taskDetl.setId(null);

            taskDetl.setTaskId(task.getId());

            taskDetl.setTaskNo(task.getTaskNo());

            taskDetl.setAnfme(locDetl.getAnfme());

            taskDetl.setStock(locDetl.getAnfme());

            taskDetl.setWaveId(null);

            taskDetl.setWaveNo(null);

            taskDetl.setOrderId(null);

            taskDetl.setOrderNo(null);

            if (!taskDetlService.save(taskDetl)) {

                throw new CoolException("保存工作档明细失败");

            }



            List<LocDetlField> locDetlFields = locDetlFieldService.list(new LambdaQueryWrapper<LocDetlField>().eq(LocDetlField::getDetlId, locDetl.getId()));

            for (LocDetlField locDetlField : locDetlFields) {

                TaskDetlField taskDetlField = new TaskDetlField();

                taskDetlField.sync(locDetlField);

                taskDetlField.setId(null);

                taskDetlField.setDetlId(taskDetl.getId());

                if (!taskDetlFieldService.save(taskDetlField)) {

                    throw new CoolException("明细扩展生成失败");

                }

            }

        }



        if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getId, locs.getId())

                .set(Loc::getUpdateTime, new Date())

                .set(Loc::getLocStsId, LocStsType.R.val()))) {

            throw new CoolException("库位状态修改失败！！");

        }

    }



    /***

     * 入库任务---下发入库任务

@@ -149,6 +235,7 @@
        log.info("下发入库任务请求地址：{}，请求参数：{}", "http://192.168.2.200:9046/task/create", JSONObject.toJSONString(tasksParam));

        HttpHeaders headers = new HttpHeaders();

        headers.add("Content-Type", "application/json");

        headers.add("api-version", "v2.0");

        HttpEntity httpEntity = new HttpEntity<>(tasksParam, headers);

        // 请求

        ResponseEntity<String> exchange = restTemplate.exchange("http://192.168.2.200:9046/task/create", HttpMethod.POST, httpEntity, String.class);

@@ -211,7 +298,7 @@
//                } else {

//                    CommonReponse commonReponse = JSON.toJavaObject(JSON.parseObject(exchange.getBody()), CommonReponse.class);

//                    if (commonReponse.getCode() == 0) {

                        //流动通知下发完成后，修改任务状态为输送线流动中。。

            //流动通知下发完成后，修改任务状态为输送线流动中。。

//                        taskService.update(new LambdaUpdateWrapper<Task>()

//                                .eq(Task::getId, task.getId())

//                                .set(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id));

@@ -244,8 +331,8 @@
    public void waveToTask() throws JsonProcessingException {

        //获取当前任务档中，所有为待出库状态的任务档，按时间升序排列

        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()

                        .ge(Task::getTaskType, 101) //TODO 如何确认是101，还是103

                        .eq(Task::getTaskSts, TaskStsType.GENERATE_OUT.id));

                .ge(Task::getTaskType, 101) //TODO 如何确认是101，还是103

                .eq(Task::getTaskSts, TaskStsType.GENERATE_OUT.id));

        if (tasks.isEmpty()) {

            return;

        }