1

zhang

12 小时以前 286eadc0913fe9974ab2f2fd188fb707dc16ad40

 zy-acs-cv/src/main/java/com/zy/core/operation/handler/SendTaskOperationHandler.java

@@ -1,6 +1,5 @@
package com.zy.core.operation.handler;

import com.core.common.DateUtils;
import com.zy.asrs.controller.vo.OpenBusSubmitParam;
import com.zy.asrs.controller.vo.TaskDto;
import com.zy.asrs.entity.Job;
@@ -58,37 +57,35 @@
                    SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                    StaProtocol staProtocol = devpThread.getStation().get(inSta.getTargetSta());
                    if (staProtocol == null) {
                        return;
                        continue;
                    } else {
                        staProtocol = staProtocol.clone();
                    }
                    // 判断是否满足条件
                    if (!staProtocol.isLoading()) {
                        return;
                        if (staProtocol.getWorkNo() > 0) {
                            log.error("输送线上有任务号无货，需要人工处理：{}", staProtocol.getSiteId());
                        }
                        continue;
                    }
                    if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
                    if (staProtocol.getWorkNo() == 0) {
                        log.error("输送线上有货无任务号，需要人工处理：{}", staProtocol.getSiteId());
                        continue;
                    }
                    if (staProtocol.isAutoing()) {
                        Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
                        if (job != null && job.getJobSts() == 5) {
                            OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
                            openBusSubmitParam.setBatchNo(job.getBatchNo());
                            List<TaskDto> taskList = new ArrayList<>();
                            TaskDto taskDto = new TaskDto();
                            taskDto.setTaskNo(job.getInTaskNo());
                            taskDto.setBatchNo(job.getBatchNo());
                            taskDto.setOriSta(job.getStaNo());
                            taskDto.setDestLoc(job.getLoc());
                            taskDto.setPriority(1);
                            taskList.add(taskDto);
                            openBusSubmitParam.setTasks(taskList);
                            if (ctuMainService.sendTask(openBusSubmitParam)) {
                                job.setJobSts(7);
                        if (job != null && job.getJobSts() == ConveyorStateType.INBOUND.getStatus()) {
                            if (ctuMainService.sendTask(process(job))) {
                                job.setJobSts(ConveyorStateType.SENDTASK.getStatus());
                                job.setRcsTime(new Date());
                                jobService.updateById(job);
                                log.info("任务发送给RCS成功," + job.getInTaskNo() + " - " + job.getJobNo());
                                log.info("任务发送给RCS成功,WMS任务号：{},输送线工作号：{}", job.getTaskNo(), job.getJobNo());
                            } else {
                                log.info("任务发送给RCS失败," + job.getInTaskNo() + " - " + job.getJobNo());
                                log.info("任务发送给RCS失败,WMS任务号：{},输送线工作号：{}", job.getTaskNo(), job.getJobNo());
                            }
                        }
                    } else {
                        log.error("输送线为自动，需要开启：{}", staProtocol.getSiteId());
                    }
                }
            }
@@ -97,4 +94,25 @@
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        }
    }

    /**
     * 处理任务
     *
     * @param job
     * @return
     */
    private OpenBusSubmitParam process(Job job) {
        OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
        openBusSubmitParam.setBatchNo(job.getBatchNo());
        List<TaskDto> taskList = new ArrayList<>();
        TaskDto taskDto = new TaskDto();
        taskDto.setTaskNo(job.getTaskNo());
        taskDto.setBatchNo(job.getBatchNo());
        taskDto.setOriSta(job.getStaNo());
        taskDto.setDestLoc(job.getLoc());
        taskDto.setPriority(1);
        taskList.add(taskDto);
        openBusSubmitParam.setTasks(taskList);
        return openBusSubmitParam;
    }
}