From 7c16bcc9b921ebe24ee6f9591e1675afc10816bf Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 25 十二月 2023 10:19:22 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 04368e8..c7ca12f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -45,11 +45,11 @@
 
                     // 婕旂ず
                     //mainService.crnDemoOfLocMove1();
-                    // 婕旂ず 鎵�鏈夊簱浣嶈疆璇�
-                    mainService.crnDemoOfLocMove2();
+//                    // 婕旂ず 鎵�鏈夊簱浣嶈疆璇�
+//                    mainService.crnDemoOfLocMove2();
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
-                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+//                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
                     mainService.stnToCrnStnPick();
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
@@ -58,6 +58,12 @@
                     mainService.crnIoExecute();
                     // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
                     mainService.storeFinished();
+
+                    //RGV鎼繍
+                    mainService.rgvIoExecute();
+                    //RGV宸ヤ綔瀹屾垚
+                    mainService.rgvFinished();
+
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr();
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
@@ -66,10 +72,10 @@
                     mainService.ledExecute();
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset();
-                    mainService.outOfDevp();
-                    // 鎵弿纰熺洏鏈鸿嚜鍔ㄥ叆搴撶┖鎵樼洏
+
+                    //鎵弿纰熺洏鏈鸿嚜鍔ㄥ叆搴撶┖鎵樼洏
                     mainService.autoEmptyIn();
-                    // 鎵弿鎷嗙洏鏈鸿嚜鍔ㄥ嚭搴撶┖鎵樼洏
+                    //鎵弿鎷嗙洏鏈鸿嚜鍔ㄥ嚭搴撶┖鎵樼洏
                     mainService.autoEmptyOut();
 
                 } catch (Exception e) {

--
Gitblit v1.9.1