From 1d71c4a6ed388f4086fc1a7b1d99ceeb6ae728b0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 22 十月 2023 17:29:26 +0800
Subject: [PATCH] #plc2

---
 src/main/java/com/zy/core/MainProcess.java |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index b3b1831..117f541 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -66,24 +66,23 @@
                     mainService.locToLocExecute();
                     //鎵ц灏忚溅绉诲簱浠诲姟
                     mainService.shuttleMoveExecute();
-//                    // 寮傚父淇℃伅璁板綍
-//                    mainService.recErr();
+                    // 寮傚父淇℃伅璁板綍
+                    mainService.recErr();
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
                     mainService.storeEmptyPlt();
+                    // AGV琛ヨ揣(鏈烘鑷傛嫞鏂�)
+                    mainService.agvRestockByRobot();
+                    // AGV琛ヨ揣(閫氱煡AGV鍙栬揣)
+                    mainService.agvRestockInto();
+                    // 300绔欐嫞鏂�
+                    mainService.pick300();
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏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