1

zhang

昨天 d35e2accdca4b3762359231f4fe479c9538b6f6f

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

@@ -50,7 +50,7 @@
    }

    @Override
    public void execute(CtuOperationConfig config) {
    public synchronized void execute(CtuOperationConfig config) {
        try {
            // 根据输送线plc遍历
            for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -69,16 +69,21 @@
                        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);
                        //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) {
                                staProtocol.setWorkNo(staProtocol.getWorkNo());
                                staProtocol.setStaNo(inSta.getTargetSta());
                                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(4);
                                    job.setInTime(new Date());
                                    job.setJobSts(5);
                                    if (!jobService.updateById(job)) {
                                        throw new CoolException("更新输送线任务失败," + " - " + staProtocol.getWorkNo());
                                    }
@@ -87,7 +92,7 @@
                            } else {
                                // 模拟操作逻辑
                            }
                        }
                        //}
                    }
                }
            }