From 64417d272e7a2a332ebbe51bb3ceec1f52274a07 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期二, 25 七月 2023 10:21:41 +0800 Subject: [PATCH] 捡料 --- src/main/java/com/zy/core/MainProcess.java | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java index 536cad9..28f02f5 100644 --- a/src/main/java/com/zy/core/MainProcess.java +++ b/src/main/java/com/zy/core/MainProcess.java @@ -41,8 +41,8 @@ continue; } - // 婕旂ず - mainService.demo(); +// // 婕旂ず +// mainService.demo(); // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。 mainService.generateStoreWrkFile(); // 缁勬墭 @@ -53,8 +53,10 @@ //鍒濆鍖栧疄鏃跺湴鍥� mainService.initRealtimeBasMap(); - //浠巖edis涓噸鍚换鍔� - mainService.restartTaskFromRedis(); +// //浠巖edis涓噸鍚换鍔� +// mainService.restartTaskFromRedis(); + // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱 + mainService.stnToCrnStnPick(); // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙� mainService.shuttleIoInExecute(); // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙� @@ -65,6 +67,8 @@ mainService.liftIoExecute(); //鎻愬崌鏈轰换鍔″畬鎴� mainService.liftFinished(); + //搴撲綅绉昏浆 + mainService.locToLocExecute(); // 寮傚父淇℃伅璁板綍 mainService.recErr(); // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐� @@ -76,19 +80,16 @@ // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢� mainService.loopShuttleCharge(); mainService.executeShuttleCharge(); - //鍑哄叆搴撴ā寮� - i++; - if (i > 1) { - mainService.outAndIn(); - i = 0; - } + +// //鍑哄叆搴撴ā寮� +// i++; +// if (i > 1) { +// mainService.outAndIn(); +// i = 0; +// } // 闂撮殧 Thread.sleep(200); - // 绌挎杞� ===>> 灏忚溅澶嶄綅鑷冲緟鏈哄簱浣� -// mainService.queryChargeLocOfComplete(); -// mainService.steFromChargeToIdleLoc(); - } catch (Exception e) { e.printStackTrace(); } -- Gitblit v1.9.1