From 4137b0cc9ce019d27f9110056f5bf454630de35f Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 12 一月 2024 08:41:50 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |   73 ++++++++++++++++++++++++++++++++++--
 1 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index a7a89ca..4903b11 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -24,6 +24,8 @@
     private MainServiceImpl mainService;
     // 鎵�灞炵嚎绋�
     private Thread thread;
+    // 棰戠巼
+    private int i = 0;
 
     /**
      * =====>>  寮�濮嬪伐浣�
@@ -41,15 +43,21 @@
                         continue;
                     }
 
+                    //鍒濆鍖朢GV鍦板浘
+//                    mainService.initRgvMap();
+                    //鍒锋柊RGV鍦板浘
+                    mainService.refreshRgvMap();
                     // 婕旂ず
                     mainService.crnDemoOfLocMove1();
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
-                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+//                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
                     mainService.stnToCrnStnPick();
+                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖�
+                    mainService.stnToCrnStnPick2();
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn();
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -58,8 +66,37 @@
 //                    mainService.crnIoWrkMast();
                     // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
                     mainService.storeFinished();
-                    // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
-                    mainService.recCrnErr();
+
+                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+
+//                    //缁戝畾灏忚溅鏂规硶
+//                    mainService.rgvBindSte();
+//                    mainService.rgvBindSte2();
+////                    // 鍏ュ嚭搴�  ===>>  RGV鍏ュ嚭搴撲綔涓氫笅鍙�
+//                    mainService.rgvIoExecute();
+//                    // RGV鍏ュ簱  ===>> 鏍规嵁RGV瀹屾垚淇″彿,鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+//                    mainService.rgvFinished();
+//                    // 鍏ュ嚭搴�  ===>>  RGV鍑哄簱绔欏埌绯荤粺鍏ュ嚭搴撶珯
+//                    mainService.rgvDestStnToCrnStn();
+//                    // 鍑哄簱  ===>>  RGV鍑哄簱绔欏埌绯荤粺鍑哄簱绔�
+//                    mainService.rgvOutDStnToOutStn();
+
+                    //瀹屾垚灏忚溅浠诲姟
+                    mainService.rgvCompleteWrkMastSta();
+                    //鎵ц灏忚溅璐х墿鎼繍浠诲姟
+                    mainService.rgvRunWrkMastFullSta();
+                    //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
+                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�
+                    mainService.rgvRunWrkMastEmptyStaTake();//鍙�
+                    i++;
+                    if (i > 3) {
+                        mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+                        i = 0;
+                    }
+                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+
+                    // 寮傚父淇℃伅璁板綍
+                    mainService.recErr();
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
                     mainService.storeEmptyPlt();
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
@@ -67,7 +104,35 @@
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset();
 
-                    mainService.outOfDevp();
+//                    mainService.outOfDevp();
+
+//                    //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
+//                    mainService.autoEmptyOut();
+//                    //绌烘墭鐩樿嚜鍔ㄥ叆搴�
+//                    mainService.autoEmptyIn();
+
+//                    // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
+//                    i++;
+//                    if (i > 1) {
+//                        mainService.ioConvert();
+//                        i = 0;
+//                    }
+
+                    //鐮佸灈浣嶈嚜鍔ㄨˉ鍏呯┖鏉匡細椹卞姩鎷嗙洏鏈鸿緭鍑烘墭鐩�
+//                    mainService.dischargingMachineOutputTray();
+
+//                    //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
+//                    mainService.scanBarcodeEmptyBoard();
+
+                    //鐮佸灈瀹屾垚椹卞姩鎵樼洏涓嬩竴姝ユ壂鐮佸叆搴�
+                    mainService.stackingCompletionDriveTray();
+                    //鎷嗗灈瀹屾垚缁х画涓嬩竴姝�
+                    mainService.stackingCompletionDriveTray2();
+                    //鎷嗗灈瀹屾垚鎵樼洏缁х画涓嬩竴姝�
+                    mainService.stackingCompletionDriveTrayOk2();
+                    //璐存爣瀹屾垚缁х画涓嬩竴姝�
+//                    mainService.stackingCompletionDriveTray3();
+
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1