From 1da55d544dffc8d8b2e88efb4532776e71b0b11c Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 15 九月 2023 16:39:09 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/MainProcess.java | 34 ++++++++-------------------------- 1 files changed, 8 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java index 4c2189a..3058a36 100644 --- a/src/main/java/com/zy/core/MainProcess.java +++ b/src/main/java/com/zy/core/MainProcess.java @@ -41,9 +41,6 @@ continue; } - // 婕旂ず - mainService.demo(); - // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。 mainService.generateStoreWrkFile(); // 缁勬墭 // mainService.generateStoreWrkFile0(); // WMS鍏ュ簱 @@ -51,26 +48,24 @@ // 闂撮殧 Thread.sleep(500); + //鍒濆鍖栧疄鏃跺湴鍥� + mainService.initRealtimeBasMap(); // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱 mainService.stnToCrnStnPick(); - // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯 - mainService.crnStnToOutStn(); - // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 - mainService.crnIoExecute(); // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙� - mainService.shuttleIoInExecute(); + mainService.shuttleInExecute(); // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙� - mainService.shuttleIoOutExecute(); + mainService.shuttleOutExecute(); //鍥涘悜绌挎杞︿换鍔″畬鎴� mainService.shuttleFinished(); //鎻愬崌鏈轰换鍔� mainService.liftIoExecute(); //鎻愬崌鏈轰换鍔″畬鎴� mainService.liftFinished(); - // 鍏ュ簱 ===>> 鎵ц鍫嗗灈鏈哄宸ヤ綔妗g殑瀹屾垚鎿嶄綔 - mainService.storeFinished(); - // 鍏ュ簱 ===>> 鎵ц绌挎杞﹀宸ヤ綔妗g殑瀹屾垚鎿嶄綔 - mainService.carGenerateStore(); + //搴撲綅绉昏浆 + mainService.locToLocExecute(); + //鎵ц灏忚溅绉诲簱浠诲姟 + mainService.shuttleMoveExecute(); // 寮傚父淇℃伅璁板綍 mainService.recErr(); // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐� @@ -82,22 +77,9 @@ // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢� mainService.loopShuttleCharge(); mainService.executeShuttleCharge(); - // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢� - mainService.loopSteCharge(); - mainService.executeSteCharge(); - //鍑哄叆搴撴ā寮� - i++; - if (i > 1) { - mainService.outAndIn(); - i = 0; - } // 闂撮殧 Thread.sleep(200); - // 绌挎杞� ===>> 灏忚溅澶嶄綅鑷冲緟鏈哄簱浣� -// mainService.queryChargeLocOfComplete(); -// mainService.steFromChargeToIdleLoc(); - } catch (Exception e) { e.printStackTrace(); } -- Gitblit v1.9.1