Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs

L

2025-09-25 3cf23392ce90c0a99835afe2db3a81206e093819

 src/main/java/com/zy/core/MainProcess.java

@@ -37,8 +37,8 @@
        thread = new Thread(this::crnAndDevRun);
        thread.start();

        armThread = new Thread(this::roboticArmDispatch);
        armThread.start();
//        armThread = new Thread(this::roboticArmDispatch);
//        armThread.start();
    }
    private void crnAndDevRun() {
        while (!Thread.currentThread().isInterrupted()) {
@@ -137,6 +137,9 @@
                }
                //完成小车任务
                mainService.rgvCompleteWrkMastSta();

                //工位移动
//                mainService.rgvStaMove();
                /////////////////////////////////////RGV调度/////////////////////////////////////

            } catch (Exception e) {