1

zhang

1 天以前 6831504a0ece1c073b65873757905936b533f2d9

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

@@ -1,17 +1,17 @@
package com.zy.acs.conveyor.core.operation.handler;


import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.controller.vo.OpenBusSubmitParam;
import com.zy.acs.conveyor.controller.vo.TaskDto;
import com.zy.acs.conveyor.core.cache.SlaveConnection;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
import com.zy.acs.conveyor.core.enums.SlaveType;
import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.operation.OperationHandler;
import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.properties.SlaveProperties;
import com.zy.acs.conveyor.core.thread.SiemensDevpThread;
import com.zy.acs.conveyor.core.service.StationService;
import com.zy.acs.conveyor.entity.Job;
import com.zy.acs.conveyor.service.CtuMainService;
import com.zy.acs.conveyor.service.JobService;
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * 发送任务给RCS
@@ -42,6 +43,14 @@
    @Autowired
    private CtuMainService ctuMainService;


    @Autowired
    private StationService stationService;


    private final RedisSupport redis = RedisSupport.defaultRedisSupport;


    @Override
    public ConveyorStateType getType() {
        return ConveyorStateType.SENDTASK;
@@ -55,8 +64,8 @@
                // 遍历入库口
                for (DevpSlave.Sta inSta : devp.getInSta()) {
                    // 根据输送线plc遍历
                    SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                    StaProtocol staProtocol = devpThread.getStation().get(inSta.getTargetSta());
                    Map<Integer, StaProtocol> stationMap = stationService.getStationMap(devp.getId());
                    StaProtocol staProtocol = stationMap.get(inSta.getTargetSta());
                    if (staProtocol == null) {
                        continue;
                    } else {
@@ -65,12 +74,14 @@
                    // 判断是否满足条件
                    if (!staProtocol.isLoading()) {
                        if (staProtocol.getWorkNo() > 0) {
                            log.error("输送线上有任务号无货，需要人工处理：{}", staProtocol.getSiteId());
                            News.error("输送线上有货无任务号，需要人工处理：{}", staProtocol.getSiteId());
                            //log.error("输送线上有任务号无货，需要人工处理：{}", staProtocol.getSiteId());
                        }
                        continue;
                    }
                    if (staProtocol.getWorkNo() == 0) {
                        log.error("输送线上有货无任务号，需要人工处理：{}", staProtocol.getSiteId());
                        News.error("输送线上有货无任务号，需要人工处理：{}", staProtocol.getSiteId());
                        //log.error("输送线上有货无任务号，需要人工处理：{}", staProtocol.getSiteId());
                        continue;
                    }
                    if (staProtocol.isAutoing()) {
@@ -86,7 +97,7 @@
                            }
                        }
                    } else {
                        log.error("输送线为自动，需要开启：{}", staProtocol.getSiteId());
                        log.error("输送线未自动，需要开启：{}", staProtocol.getSiteId());
                    }
                }
            }