From 4163d0bededbd67bb24439f1f15ae7639008d823 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 06 十二月 2023 21:33:34 +0800
Subject: [PATCH] #盘点修改
---
src/main/java/com/zy/core/MainProcess.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 555c5f1..2afd5de 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鍏ュ簱
@@ -53,16 +50,18 @@
//鍒濆鍖栧疄鏃跺湴鍥�
mainService.initRealtimeBasMap();
-// //浠巖edis涓噸鍚换鍔�
-// mainService.restartTaskFromRedis();
- // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+ // 鎷ｆ枡銆佸苟鏉垮啀鍏ュ簱
mainService.stnToCrnStnPick();
-// // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
-// mainService.shuttleIoInExecute();
-// // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
-// mainService.shuttleIoOutExecute();
-// //鍥涘悜绌挎杞︿换鍔″畬鎴�
-// mainService.shuttleFinished();
+ // 鎷ｆ枡銆佸苟鏉垮啀鍏ュ簱(325銆�331銆�333銆�339)
+ mainService.stnToCrnStnPick2();
+ // 鐩樼偣鍐嶅叆搴�
+ mainService.stnToCrnStnPlate();
+ // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
+ mainService.shuttleInExecute();
+ // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
+ mainService.shuttleOutExecute();
+ //鍥涘悜绌挎杞︿换鍔″畬鎴�
+ mainService.shuttleFinished();
//鎻愬崌鏈轰换鍔�
mainService.liftIoExecute();
//鎻愬崌鏈轰换鍔″畬鎴�
@@ -71,24 +70,27 @@
mainService.locToLocExecute();
//鎵ц灏忚溅绉诲簱浠诲姟
mainService.shuttleMoveExecute();
-// // 寮傚父淇℃伅璁板綍
-// mainService.recErr();
+ // 寮傚父淇℃伅璁板綍
+ mainService.recErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
mainService.storeEmptyPlt();
+ // AGV琛ヨ揣 => 鐢熸垚鍏ュ簱閫氱煡妗�
+ mainService.robotGenerateAgvTask();
+ // AGV琛ヨ揣(鏈烘鑷傛嫞鏂�)
+ mainService.agvRestockByRobot();
+ // AGV琛ヨ揣(閫氱煡AGV鍙栬揣)
+ mainService.agvRestockInto();
+ // AGV琛ヨ揣(鎮寕绾块�氱煡AGV鍙栬揣)
+ mainService.agvRestockIntoByHangingWire();
+ // 300绔欐嫞鏂�
+ mainService.pick300();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
// 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
-// mainService.loopShuttleCharge();
-// mainService.executeShuttleCharge();
-
-// //鍑哄叆搴撴ā寮�
-// i++;
-// if (i > 1) {
-// mainService.outAndIn();
-// i = 0;
-// }
+ mainService.loopShuttleCharge();
+ mainService.executeShuttleCharge();
// 闂撮殧
Thread.sleep(200);
--
Gitblit v1.9.1