1

Administrator

1 天以前 14717fd672bc62442175d2ce2ddd3a113f0069b8

 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
@@ -79,20 +80,24 @@
                    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);

                            Job job = jobService.getJobByTaskNo(seqNum);
                            if (job != null) {
                                News.error("{}：站点：{}，存在任务,{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(job));
                                continue;
                            }

                            staProtocol.setSafeSignal(new SafeSignal(devp.getPutSta().indexOf(putSta), true, true));
                            redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocol);


                            int workNo = wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
                            staProtocol.setWorkNo(workNo);
                            staProtocol.setStaNo(putSta.getTargetSta());
                            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);