#输送线循环BUG修复

lty

2025-03-27 9540c4904147cb4baf037892447d6f85dc004646

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -158,10 +158,30 @@
                        if (staProtocol.getSiteId() == 107 || staProtocol.getSiteId() == 109) {
                            StaProtocol staProtocol5 = getClonedStation(devpThread, staProtocol.getSiteId() - 1);
                            if (staProtocol5 != null && (staProtocol5.isLoading() && (staProtocol5.getStaNo() == 107 || staProtocol5.getStaNo() == 109))) {
                                short workNo = staProtocol5.getWorkNo();

                                // **先清零，等待 100ms**
                                staProtocol5.setWorkNo((short) 0);
                                staProtocol5.setStaNo((short) 0);
                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol5));
                                Thread.sleep(100);

                                // **再写入目标值**
                                staProtocol5.setWorkNo(workNo);
                                staProtocol5.setStaNo((short) 112);
                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol5));
                            }
                        } else {
                            short workNo = staProtocol.getWorkNo();

                            // **先清零，等待 100ms**
                            staProtocol.setWorkNo((short) 0);
                            staProtocol.setStaNo((short) 0);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            Thread.sleep(100);

                            // **再写入目标值**
                            staProtocol.setWorkNo(workNo);
                            staProtocol.setStaNo((short) 112);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        }
@@ -186,30 +206,45 @@
        try{
            for (DevpSlave devp : slaveProperties.getDevp()) {
                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                if (devpThread == null) {
                    continue;
                }

                StaProtocol staProtocol = devpThread.getStation().get(112);
                if (staProtocol == null) {
                    continue;
                } else {
                    staProtocol = staProtocol.clone();
                }
                if(staProtocol.getWorkNo() == 0){
                if (staProtocol == null || staProtocol.getWorkNo() == 0) {
                    continue;
                }

                // 查询任务信息
                TaskWrk taskWrk = taskWrkMapper.selectStaWorking(Integer.valueOf(staProtocol.getWorkNo()));
                if(taskWrk != null &&  taskWrk.getWrkNo() < 9001 && taskWrk.getWrkNo() > 6000){
                if (taskWrk == null || taskWrk.getWrkNo() < 6001 || taskWrk.getWrkNo() > 9000) {
                    continue;
                }

                // 先清零
                short workNo = staProtocol.getWorkNo();
                short oldStaNo = staProtocol.getStaNo();
                staProtocol.setWorkNo((short) 0);
                staProtocol.setStaNo((short) 0);
                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                Thread.sleep(100); // 让 PLC 识别变化

                // 再写入目标站点
                staProtocol.setWorkNo(workNo);
                    staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
                    MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                }

                log.info("Shifted from cycle station 112 to target {}, workNo: {}", taskWrk.getTargetPoint(), workNo);
            }
        }catch (Exception e) {
            log.error("generateStoreWrkFile e", e);
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            log.error("shiftCyclePointToTarget error", e);
        }
    }





    public synchronized void generateStoreWrkFile1() throws IOException, InterruptedException {
        try {
            // 根据输送线plc遍历