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

zjj

2024-06-19 d0dcc1dc625f41e8a674828a51a96dddc6f288e0

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

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

@@ -117,9 +117,8 @@

                    /////////////////////////////////////RGV调度/////////////////////////////////////
                    /////////////////////////////////////RGV调度/////////////////////////////////////
                    i++;
                    k++;
                    if (i<4) {

                        // RGV  ===>>  小车任务作业下发
                        try{
                            boolean rgvIoExecuteSign = mainService.rgvRunWrkMastFullSta();
@@ -131,9 +130,6 @@
                            }
                        }catch (Exception e){
                            log.error("RGV  ===>>  小车任务作业下发异常"+e);
                        }
                    }else {
                        i = 0;
                    }
                    //完成小车任务
                    mainService.rgvCompleteWrkMastSta();