1

zhang

13 小时以前 25650bd51704793cf78408d28853c89fda837c4c

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

@@ -18,6 +18,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

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

/**
@@ -69,7 +70,7 @@
                            continue;
                        }
                        if (!staProtocol.isAutoing()) {
                            News.error("{}：站点：{}，非自动", config.getMark(), staProtocol.getSiteId());
                            //News.error("{}：站点：{}，非自动", config.getMark(), staProtocol.getSiteId());
                            continue;
                        }
                        if (!staProtocol.isLoading()) {
@@ -84,7 +85,7 @@
                        continue;
                    }
                    if (jobByJobNo.getJobSts() != ConveyorStateType.OUTBOUND.getStatus()) {
                        if (jobByJobNo.getJobSts() == ConveyorStateType.STARTUP.getStatus()){
                        if (jobByJobNo.getJobSts() == ConveyorStateType.STARTUP.getStatus()) {
                            continue;
                        }
                        News.error("{}：站点：{}，任务状态不对，{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(jobByJobNo));
@@ -92,7 +93,7 @@
                    }
                    staProtocol.setStaNo(inSta.getStaNo());
                    redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);

                    jobByJobNo.setStartTime(new Date());
                    jobByJobNo.setJobSts(ConveyorStateType.STARTUP.getStatus());
                    if (!jobService.updateById(jobByJobNo)) {
                        News.info("{},启动入库：{},{}", config.getMark(), staProtocol.getWorkNo(), staProtocol.getStaNo());