1

zhang

昨天 15dc3914bdf06e0351b6f39388b3b1512a928904

1

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java

@@ -144,6 +144,7 @@
                    if (staNo != null) {
                        staProtocol.setStaNo(staNo);
                    }
                    staProtocol.setStartUpFlag(true);
                    redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
                    return R.ok();


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

@@ -97,7 +97,9 @@
//                        News.error("{}：站点：{}，任务状态不对，{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(jobByJobNo));
//                        continue;
//                    }
                    if (staProtocol.getWorkNo() == 0) {


                    if (staProtocol.getWorkNo() == 0 && !staProtocol.isStartUpFlag()) {
                        Job job = initJob(getWorkNo(), staProtocol.getSiteId() + "");
                        staProtocol.setWorkNo(job.getJobNo());
                        staProtocol.setStaNo(inSta.getStaNo());

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java

@@ -169,7 +169,7 @@
        staProtocol.setSegApply(status2[2]);
        staProtocol.setApplyErr(status2[3]);

        if (!status2[1] && !status[0]) {
        if (!status2[1] && !status[1]) {
            staProtocol.setStartUpFlag(true);
        }