From 0e32b14a61afca8f7dbbe9851f47b57158abfdc1 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 21 一月 2024 10:40:56 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 9634d57..48c9273 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -26,6 +26,7 @@
     private Thread thread;
     // 棰戠巼
     private int i = 0;
+    private int j = 0;
 
     /**
      * =====>>  寮�濮嬪伐浣�
@@ -43,15 +44,23 @@
                         continue;
                     }
 
+                    //鍒濆鍖朢GV鍦板浘
+//                    mainService.initRgvMap();
+                    //鍒锋柊RGV鍦板浘
+                    mainService.refreshRgvMap();
                     // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
+//                    mainService.crnDemoOfLocMove1();
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
+                    // 鍏ュ簱  ===>> 鐮佸灈浣嶈幏鍙栫┖鏉挎潯鐮佷俊鎭�
+                    mainService.generateStoreWrkFileFull2LouM(); // 缁勬墭
                     mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
                     mainService.stnToCrnStnPick();
+                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖�   1妤兼媶鍨涗綅缃�
+                    mainService.stnToCrnStnPick2();
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn();
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -61,39 +70,93 @@
                     // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
                     mainService.storeFinished();
 
-                    ///////////////////////RGV璋冨害/////////////////////////////////////
-                    // 鍏ュ嚭搴�  ===>>  RGV鍏ュ嚭搴撲綔涓氫笅鍙�
-                    mainService.rgvIoExecute();
-                    // RGV鍏ュ簱  ===>> 鏍规嵁RGV瀹屾垚淇″彿,鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
-                    mainService.rgvFinished();
-                    // 鍏ュ嚭搴�  ===>>  RGV鍑哄簱绔欏埌绯荤粺鍏ュ嚭搴撶珯
-                    mainService.rgvDestStnToCrnStn();
+                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+
+//                    //缁戝畾灏忚溅鏂规硶
+//                    mainService.rgvBindSte();
+//                    mainService.rgvBindSte2();
+////                    // 鍏ュ嚭搴�  ===>>  RGV鍏ュ嚭搴撲綔涓氫笅鍙�
+//                    mainService.rgvIoExecute();
+//                    // RGV鍏ュ簱  ===>> 鏍规嵁RGV瀹屾垚淇″彿,鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+//                    mainService.rgvFinished();
+//                    // 鍏ュ嚭搴�  ===>>  RGV鍑哄簱绔欏埌绯荤粺鍏ュ嚭搴撶珯
+//                    mainService.rgvDestStnToCrnStn();
 //                    // 鍑哄簱  ===>>  RGV鍑哄簱绔欏埌绯荤粺鍑哄簱绔�
 //                    mainService.rgvOutDStnToOutStn();
-                    //////////////////////////////////////////////////////////////////
 
-                    // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
-                    mainService.recCrnErr();
-                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
+                    //瀹屾垚灏忚溅浠诲姟
+                    mainService.rgvCompleteWrkMastSta();
+                    i++;
+                    if (i<7) {
+                        // RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂
+                        try{
+                            mainService.rgvIoExecute(i);
+                        }catch (Exception e){
+                            log.error("RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+                        }
+                    }else {
+                        i = 0;
+                    }
+
+
+//                    //鎵ц灏忚溅璐х墿鎼繍浠诲姟
+//                    mainService.rgvRunWrkMastFullSta();
+//                    //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
+//                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�//鎷嗙洏
+//                    mainService.rgvRunWrkMastEmptyStaPutFull();//婊℃斁
+//                    mainService.rgvRunWrkMastEmptyStaTake();//鍙栧彔鐩�
+//                    mainService.rgvRunWrkMastEmptyStaTakeFull();////婊″彇
+//                    mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+
+                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+
+                    // 寮傚父淇℃伅璁板綍
+                    mainService.recErr();
+                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�  2妤�
                     mainService.storeEmptyPlt();
+                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
+                    mainService.storeEmptyPlt2();
+                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満绌烘澘鍏ュ簱
+                    mainService.storeEmptyPlt3();
+                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖�   1妤兼媶鍨涗綅缃�  绌烘澘鍙犵洏
+                    mainService.storeEmptyPlt4();
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute();
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset();
 
-                    mainService.outOfDevp();
+//                    mainService.outOfDevp();
 
-                    //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
-                    mainService.autoEmptyOut();
+//                    //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
+//                    mainService.autoEmptyOut();
 //                    //绌烘墭鐩樿嚜鍔ㄥ叆搴�
 //                    mainService.autoEmptyIn();
 
-                    // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
-                    i++;
-                    if (i > 1) {
-                        mainService.ioConvert();
-                        i = 0;
-                    }
+//                    // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
+//                    i++;
+//                    if (i > 1) {
+//                        mainService.ioConvert();
+//                        i = 0;
+//                    }
+
+                    //鐮佸灈浣嶈嚜鍔ㄨˉ鍏呯┖鏉匡細椹卞姩鎷嗙洏鏈鸿緭鍑烘墭鐩�
+//                    mainService.dischargingMachineOutputTray();
+
+//                    //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
+//                    mainService.scanBarcodeEmptyBoard();
+
+                    //鐮佸灈瀹屾垚椹卞姩鎵樼洏涓嬩竴姝ユ壂鐮佸叆搴�
+                    mainService.stackingCompletionDriveTray();
+                    //鎷嗗灈瀹屾垚缁х画涓嬩竴姝�
+                    mainService.stackingCompletionDriveTray2();
+                    //璐存爣瀹屾垚缁х画涓嬩竴姝�
+//                    mainService.stackingCompletionDriveTray3();
+                    //鎷嗗灈瀹屾垚缁х画涓嬩竴姝�  杩愯閫斾腑鑷姩閬胯绌烘澘
+                    mainService.stackingCompletionDriveTray4();
+                    //鎷嗗灈瀹屾垚鎵樼洏缁х画涓嬩竴姝�
+                    mainService.stackingCompletionDriveTrayOk2();
+                    //閫�璐х爜鍨涘畬鎴愭墭鐩樼户缁笅涓�姝�
+                    mainService.stackingCompletionDriveTrayOk3();
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1