1

zhang

9 小时以前 25650bd51704793cf78408d28853c89fda837c4c

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

@@ -24,6 +24,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Date;
import java.util.Map;

@Slf4j
@@ -72,15 +73,15 @@
                    }
                    // 判断是否满足条件
                    if (!staProtocol.isAutoing()) {
                        News.error("{},输送线未自动，需要开启：{}", config.getMark(), staProtocol.getSiteId());
                        //News.error("{},输送线未自动，需要开启：{}", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }

                    if (staProtocol.getWorkNo() == 0 && staProtocol.isLoading()) {
                        String seqNum = ctuMainService.checkStationStatus(putSta.getStaNo());
                        if (seqNum != null) {
                            staProtocol.setSafeSignal(new SafeSignal( devp.getPutSta().indexOf(putSta) ,(short)1,true));
                            //redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG,staProtocol );
                            staProtocol.setSafeSignal(new SafeSignal(devp.getPutSta().indexOf(putSta), (short) 1, true));
                            redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocol);

                            Job job = jobService.getJobByTaskNo(seqNum);
                            if (job != null) {
@@ -93,6 +94,7 @@
                            job = new Job();
                            job.setTaskNo(seqNum);
                            job.setJobNo(workNo);
                            job.setCreateTime(new Date());
                            job.setJobSts(ConveyorStateType.OUTBOUND.getStatus());
                            if (!jobService.insert(job)) {
                                throw new CoolException("插入输送线任务失败," + seqNum + " - " + workNo);