1

Administrator

2 天以前 b0a96a43d99eb5baf708c4fa0d0482696d7b0823

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

@@ -5,6 +5,7 @@
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
import com.zy.acs.conveyor.core.model.SafeSignal;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.operation.OperationHandler;
import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
@@ -71,7 +72,7 @@
                        News.error("{}：站点：{}，非自动", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }
                    if (staProtocol.getWorkNo() > 0) {
                    if (staProtocol.getWorkNo() > 0 && !staProtocol.isLoading()) {
                        Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
                        if (job == null) {
                            News.error("{}：站点：{}，找不到任务", config.getMark(), staProtocol.getSiteId());
@@ -85,9 +86,8 @@
                            continue;
                        }
                        //String s = ctuMainService.checkStationStatus(takeSta.getStaNo());
                        staProtocol.setWorkNo(0);
                        staProtocol.setStaNo(0);
                        redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
                        staProtocol.setSafeSignal(new SafeSignal( devp.getPutSta().indexOf(takeSta) ,(short)1,false));


                        job.setJobSts(ConveyorStateType.CLEARSIGNAL.getStatus());
                        if (!jobService.updateById(job)){