From 0df6e7bb33c9f6a18f026a500776b00cbf2ae62c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 十二月 2024 09:48:06 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 4a88cb3..568d8a8 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -43,15 +43,13 @@
 
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
-//                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
-
-                    // 闂撮殧
-                    Thread.sleep(500);
 
                     //鍒濆鍖栧疄鏃跺湴鍥�
                     mainService.initRealtimeBasMap();
-                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+                    // 鎷f枡銆佸苟鏉垮啀鍏ュ簱
                     mainService.stnToCrnStnPick();
+                    // 鐩樼偣鍐嶅叆搴�
+                    mainService.stnToCrnStnPlate();
                     // 鍏ュ簱  ===>>  鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
                     mainService.shuttleInExecute();
                     // 鍑哄簱  ===>>  鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
@@ -70,16 +68,6 @@
                     mainService.recErr();
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
                     mainService.storeEmptyPlt();
-                    // AGV琛ヨ揣 => 鐢熸垚鍏ュ簱閫氱煡妗�
-                    mainService.robotGenerateAgvTask();
-                    // AGV琛ヨ揣(鏈烘鑷傛嫞鏂�)
-                    mainService.agvRestockByRobot();
-                    // AGV琛ヨ揣(閫氱煡AGV鍙栬揣)
-                    mainService.agvRestockInto();
-                    // AGV琛ヨ揣(鎮寕绾块�氱煡AGV鍙栬揣)
-                    mainService.agvRestockIntoByHangingWire();
-                    // 300绔欐嫞鏂�
-                    mainService.pick300();
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute();
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
@@ -88,6 +76,9 @@
                     mainService.loopShuttleCharge();
                     mainService.executeShuttleCharge();
 
+                    //鎵弿璁惧PakMk鏍囪鏄惁瓒呮椂
+                    mainService.scanDevicePakMk();
+
                     // 闂撮殧
                     Thread.sleep(200);
                 } catch (Exception e) {

--
Gitblit v1.9.1