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

zjj

2024-06-26 23cd2e02d10d18462b8bdfa8f181451f37139cab

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

@@ -26,6 +26,7 @@
    private Thread thread;
    // 频率
    private int i = 0;
    private int k = 0;
    private boolean rgcWrk = true;

    /**
@@ -99,14 +100,14 @@
                    /////////////////////////////////////RGV调度/////////////////////////////////////
//
                    //完成小车任务
                    mainService.rgvCompleteWrkMastSta();
//                    mainService.rgvCompleteWrkMastSta();

//                    //执行小车空板搬运任务
//                    mainService.rgvRunWrkMastEmptyStaPut();//放
//                    mainService.rgvRunWrkMastEmptyStaTake();//取
//                    if (rgcWrk){
//                        //执行小车货物搬运任务
                        mainService.rgvRunWrkMastFullSta();
//                        mainService.rgvRunWrkMastFullSta();
//                        rgcWrk = false;
//                    }else {
//                        mainService.rgvRunWrkMastEmptyStaAvoidance();//避让
@@ -115,6 +116,24 @@


                    /////////////////////////////////////RGV调度/////////////////////////////////////
                    /////////////////////////////////////RGV调度/////////////////////////////////////
                    k++;

                    // RGV  ===>>  小车任务作业下发
                    try{
                        boolean rgvIoExecuteSign = mainService.rgvRunWrkMastFullSta();
                        if (rgvIoExecuteSign){
                            k = 0;
                        } else if (k>4){
                            k = 0;
                            mainService.rgvRunWrkMastEmptyStaAvoidance();//避让
                        }
                    }catch (Exception e){
                        log.error("RGV  ===>>  小车任务作业下发异常"+e);
                    }
                    //完成小车任务
                    mainService.rgvCompleteWrkMastSta();
                    /////////////////////////////////////RGV调度/////////////////////////////////////

                } catch (Exception e) {
                    e.printStackTrace();