1

zhang

16 小时以前 b7e27e0760d7a912de932dc24cb49a5302530355

 zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java

@@ -21,8 +21,6 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Date;

/**
 * 入库
 */
@@ -50,7 +48,7 @@
    }

    @Override
    public void execute(CtuOperationConfig config) {
    public synchronized void execute(CtuOperationConfig config) {
        try {
            // 根据输送线plc遍历
            for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -69,25 +67,30 @@
                        return;
                    }
                    if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
                        StaProtocol targetStaProtocol = devpThread.getStation().get(inSta.getTargetSta());
                        if (targetStaProtocol.getWorkNo() == 0 && targetStaProtocol.isAutoing() && !targetStaProtocol.isLoading()) {
                            Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), 2);
                            if (job != null) {
                                staProtocol.setWorkNo(staProtocol.getWorkNo());
                                staProtocol.setStaNo(inSta.getTargetSta());
                                boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                                if (result) {
                                    job.setJobSts(4);
                                    job.setInTime(new Date());
                                    if (!jobService.updateById(job)) {
                                        throw new CoolException("更新输送线任务失败," + " - " + staProtocol.getWorkNo());
                                    }
                                    log.info("" + config.getMark() + "入库前进：{},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
                        //StaProtocol targetStaProtocol = devpThread.getStation().get(inSta.getTargetSta());
                        //if (targetStaProtocol.getWorkNo() == 0 && targetStaProtocol.isAutoing() && !targetStaProtocol.isLoading()) {
                        Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), 4);
                        if (job != null) {
                            Integer workNo = staProtocol.getWorkNo();
                            Integer targetSta = inSta.getTargetSta();
                            staProtocol.setWorkNo(0);
                            staProtocol.setStaNo(0);
                            MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                            Thread.sleep(1500L);
                            staProtocol.setWorkNo(workNo);
                            staProtocol.setStaNo(targetSta);
                            boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                            if (result) {
                                job.setJobSts(5);
                                if (!jobService.updateById(job)) {
                                    throw new CoolException("更新输送线任务失败," + " - " + staProtocol.getWorkNo());
                                }
                            } else {
                                // 模拟操作逻辑
                                log.info("" + config.getMark() + "入库前进：{},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
                            }
                        } else {
                            // 模拟操作逻辑
                        }
                        //}
                    }
                }
            }