1

zhang

1 天以前 6831504a0ece1c073b65873757905936b533f2d9

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

@@ -1,5 +1,6 @@
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.core.constant.RedisConveyorConstant;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
@@ -25,7 +26,7 @@

@Slf4j
@Component
public class OutOperationHandler implements OperationHandler {
public class OutOperationHandler implements OperationHandler  {

    @Autowired
    private SlaveProperties slaveProperties;
@@ -70,20 +71,21 @@
                    // 判断是否满足条件
                    if (!staProtocol.isLoading()) {
                        if (staProtocol.getWorkNo() > 0) {
                            log.error("输送线上有任务号无货，需要人工处理：{}", staProtocol.getSiteId());
                            News.error("输送线上有任务号无货，需要人工处理：{}", staProtocol.getSiteId());
                            //log.error("输送线上有任务号无货，需要人工处理：{}", staProtocol.getSiteId());
                        }
                        continue;
                    }

                    if (staProtocol.isAutoing() && staProtocol.getWorkNo() == 0) {
                        if (staProtocol.isInEnable()) {
                            log.error("没有可入信号：{}", staProtocol.getSiteId());
                            News.error("没有可入信号：{}", staProtocol.getSiteId());
                            //log.error("没有可入信号：{}", staProtocol.getSiteId());
                            continue;
                        }
                        String seqNum = ctuMainService.checkStationStatus(releaseSta.getStaNo());
                        if (seqNum != null) {
                            Job jobBySeqNum = jobService.getJobByTaskNo(seqNum);
                            if (jobBySeqNum == null) {
                            if (jobService.getJobByTaskNo(seqNum) == null) {
                                int workNo = wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
                                // 下发移动 且 下发plc命令
                                staProtocol.setWorkNo(workNo);
@@ -93,13 +95,14 @@
                                job.setJobNo(workNo);
                                job.setJobSts(ConveyorStateType.OUTBOUND.getStatus());
                                if (!jobService.insert(job)) {
                                    throw new CoolException("插入输送线任务失败," + jobBySeqNum + " - " + workNo);
                                    throw new CoolException("插入输送线任务失败," + seqNum + " - " + workNo);
                                }
                                redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
                                log.info("输送线下发：{},{}", staProtocol.getWorkNo(), releaseSta.getTargetSta());
                            }
                        } else {
                            log.info("站点信息不符合入库条件！！！" + " 调用RCS检验未通过,站点：{}", staProtocol.getSiteId());
                            News.error("站点信息不符合入库条件！！！" + " 调用RCS检验未通过,站点：{}", staProtocol.getSiteId());
                            //log.info("站点信息不符合入库条件！！！" + " 调用RCS检验未通过,站点：{}", staProtocol.getSiteId());
                        }
                    }
                }