1

zhang

1 天以前 038634540d95d4a5787b80a1fbab131df4d99823

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

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

import com.alibaba.fastjson.JSON;
import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
@@ -63,19 +64,35 @@
                    }
                    // 判断是否满足条件
                    if (staProtocol.isLoading()) {
                        //News.error("{}：站点：{}，有物", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }
                    if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
                    if (!staProtocol.isAutoing()) {
                        News.error("{}：站点：{}，非自动", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }
                    if (staProtocol.getWorkNo() > 0) {
                        Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
                        if (job != null && job.getJobSts() == ConveyorStateType.SENDTASK.getStatus()) {
                            //String s = ctuMainService.checkStationStatus(takeSta.getStaNo());
                            staProtocol.setWorkNo(0);
                            staProtocol.setStaNo(0);
                            redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
                        if (job == null) {
                            News.error("{}：站点：{}，找不到任务", config.getMark(), staProtocol.getSiteId());
                            continue;
                        }
                        if (job.getJobSts() != ConveyorStateType.SENDTASK.getStatus()) {
                            if (job.getJobSts() == ConveyorStateType.CLEARSIGNAL.getStatus()){
                                continue;
                            }
                            News.error("{}：站点：{}，任务状态不对，{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(job));
                            continue;
                        }
                        //String s = ctuMainService.checkStationStatus(takeSta.getStaNo());
                        staProtocol.setWorkNo(0);
                        staProtocol.setStaNo(0);
                        redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);

                            job.setJobSts(ConveyorStateType.CLEARSIGNAL.getStatus());
                            jobService.updateById(job);
                            //log.info("" + config.getMark() + "站点清空：{},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
                        job.setJobSts(ConveyorStateType.CLEARSIGNAL.getStatus());
                        if (!jobService.updateById(job)){
                            log.info("" + config.getMark() + "站点清空失败：{},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
                        }else {
                            News.info("" + config.getMark() + "站点清空：{},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
                        }
                    }