1

zhang

昨天 912d09bc076272770a507517e71703078c8ae9d7

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

@@ -1,6 +1,5 @@
package com.zy.acs.conveyor.core.operation.handler;

import com.alibaba.fastjson.JSON;
import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
@@ -99,8 +98,8 @@
//                    }


                    if (staProtocol.getWorkNo() == 0 && !staProtocol.isStartUpFlag()) {
                        Job job = initJob(getWorkNo());
                    if (staProtocol.getWorkNo() == 0 && staProtocol.isStartUpFlag()) {
                        Job job = initJob(getWorkNo(), staProtocol.isFullPlt());
                        staProtocol.setWorkNo(job.getJobNo());
                        staProtocol.setStaNo(inSta.getStaNo());
                        staProtocol.setStartUpFlag(false);
@@ -118,15 +117,17 @@
        }
    }

    private Job initJob(Integer workNo) {
    private Job initJob(Integer workNo, Boolean fullPlt) {
        Job job = new Job();
        job.setJobNo(workNo);
        job.setJobSts(ConveyorStateType.STARTUP.getStatus());
        job.setStartTime(new Date());
        job.setCreateTime(new Date());
        job.setFull(fullPlt.toString());
        return job;
    }

    private Integer getWorkNo() {
        return wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
        return wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_IN_TYPE.type);
    }
}