From c9a3592c20b7913dd9949383721ae26c32563eb7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 02 十一月 2024 10:25:11 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |   59 ++++++++++++++++++++++++-----------------------------------
 1 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c7b25f7..358275a 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -37,66 +37,55 @@
 
                     // 闂撮殧
                     Thread.sleep(1000);
-
                     // 绯荤粺杩愯鐘舵�佸垽鏂�
                     if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
                         continue;
                     }
-
-                    // 婕旂ず
-                    //mainService.crnDemoOfLocMove1();
-
-                    // 婕旂ず 鎵�鏈夊簱浣嶈疆璇�
-                    mainService.crnDemoOfLocMove2();
-
-                    // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
-//                    mainService.ioConvert();
-
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
-
-                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
-
+                    Thread.sleep(200);
+//                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
                     mainService.stnToCrnStnPick();
-
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn();
-
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
                     mainService.crnIoExecute();
-
-                    // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
-//                    mainService.crnIoWrkMast();
-
                     // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
                     mainService.storeFinished();
-
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr();
-
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
                     mainService.storeEmptyPlt();  // 绌烘澘鍏ュ簱
-
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute();
-
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset();
 
-                    mainService.outOfDevp();
-
-                    //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
+                    //鎵弿纰熺洏鏈鸿嚜鍔ㄥ叆搴撶┖鎵樼洏
+                    mainService.autoEmptyIn();
+                    //鎵弿鎷嗙洏鏈鸿嚜鍔ㄥ嚭搴撶┖鎵樼洏
                     mainService.autoEmptyOut();
-//                    //绌烘墭鐩樿嚜鍔ㄥ叆搴�
-//                    mainService.autoEmptyIn();
 
-                    // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
-                    i++;
-                    if (i > 1) {
-                        mainService.ioConvert();
-                        i = 0;
-                    }
+                    //浜屾湡
+//                    //绌烘《搴撲换鍔$敓鎴�
+//                    mainService.crn5TaskCreate();
+//                    //绌烘《搴撳叆搴�
+//                    mainService.crn5InTask();
+//                    //绌烘《鍑哄簱瀹屾垚
+//                    mainService.crn5StnToOutStn();
+                    //rgv浠诲姟
+                    mainService.RGVTaskCreate();
+                    //rgv1,3浠诲姟瀹屾垚
+                    mainService.RGVTaskput();
+                    mainService.RGVTaskOver();
+
+                    //rgv2浠诲姟瀹屾垚
+                    mainService.RGV2Taskput();
+                    mainService.RGV2TaskOver();
+                    //浜屾湡缁勬墭
+                    mainService.generateStoreWrkFile2();
+
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1