From 54ce2d7dc12d162f1403cd278faeeed6874a95c5 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 23 五月 2024 09:45:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |  103 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index ab1cb60..f671080 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -26,6 +26,8 @@
     private Thread thread;
     // 棰戠巼
     private int i = 0;
+    private int j = 0;
+    private int k = 0;
 
     /**
      * =====>>  寮�濮嬪伐浣�
@@ -45,57 +47,81 @@
 
                     //鍒濆鍖朢GV鍦板浘
 //                    mainService.initRgvMap();
+                    //鍒锋柊RGV鍦板浘
+//                    mainService.refreshRgvMap();
                     // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
+//                    mainService.crnDemoOfLocMove1();
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
+                    mainService.generateStoreWrkFileSingle(); // 缁勬墭  鍙屽伐浣嶅崟浼�   灏忔枡绠�
+                    mainService.generateStoreWrkFileLarge(); // 缁勬墭  鍙屽伐浣嶅崟浼�   澶ф枡绠�
+                    // 鍏ュ簱  ===>> 鐮佸灈浣嶈幏鍙栫┖鏉挎潯鐮佷俊鎭�
+//                    mainService.generateStoreWrkFileFull2LouM(); // 缁勬墭
                     mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-                    mainService.stnToCrnStnPick();
+//                    mainService.stnToCrnStnPick();
+                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖�   1妤兼媶鍨涗綅缃�
+//                    mainService.stnToCrnStnPick2();
+                    // 2妤�212鍛煎彨绌烘澘
+//                    mainService.stnToCrnStnPick3Auto(i);
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn();
+                    // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯  宸ヤ綅2
+                    mainService.crnStnToOutStnTwo();
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
                     mainService.crnIoExecute();
+                    // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂  鍙屽伐浣嶅爢鍨涙満
+                    mainService.crnIoExecuteTwo();
                     // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
 //                    mainService.crnIoWrkMast();
                     // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
                     mainService.storeFinished();
+                    // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�  宸ヤ綅2
+                    mainService.storeFinishedTwo();
 
-                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+//                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+                    i++;
+                    k++;
+                    if (i<7) {
+                        // RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂
+                        try{
+//                            boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
+//                            if (rgvIoExecuteSign){
+//                                k = 0;
+//                            } else if (k>7){
+//                                k = 0;
+//                                mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+//                            }
+                        }catch (Exception e){
+                            log.error("RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+                        }
+                    }else {
+                        i = 0;
+                    }
+//                    //瀹屾垚灏忚溅浠诲姟
+//                    mainService.rgvCompleteWrkMastSta();
+//                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
 
-//                    //缁戝畾灏忚溅鏂规硶
-//                    mainService.rgvBindSte();
-//                    // 鍏ュ嚭搴�  ===>>  RGV鍏ュ嚭搴撲綔涓氫笅鍙�
-//                    mainService.rgvIoExecute();
-//                    // RGV鍏ュ簱  ===>> 鏍规嵁RGV瀹屾垚淇″彿,鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
-//                    mainService.rgvFinished();
-//                    // 鍏ュ嚭搴�  ===>>  RGV鍑哄簱绔欏埌绯荤粺鍏ュ嚭搴撶珯
-//                    mainService.rgvDestStnToCrnStn();
-//                    // 鍑哄簱  ===>>  RGV鍑哄簱绔欏埌绯荤粺鍑哄簱绔�
-//                    mainService.rgvOutDStnToOutStn();
-
-
-
-
-                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
-
-                    // 寮傚父淇℃伅璁板綍
-                    mainService.recErr();
-                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
+//                    // 寮傚父淇℃伅璁板綍
+//                    mainService.recErr();
+                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱
                     mainService.storeEmptyPlt();
+                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱  鍙屽伐浣嶅崟浼�   灏忔枡绠�
+                    mainService.storeEmptyPltSingle();
+                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱  鍙屽伐浣嶅崟浼�   澶ф枡绠�
+                    mainService.storeEmptyPltLarge();
+//                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満绌烘澘鍏ュ簱
+//                    mainService.storeEmptyPlt3();
+//                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
+//                    mainService.storeEmptyPlt2();
+//                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖�   1妤兼媶鍨涗綅缃�  绌烘澘鍙犵洏
+//                    mainService.storeEmptyPlt4();
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute();
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset();
-
-//                    mainService.outOfDevp();
-
-//                    //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
-//                    mainService.autoEmptyOut();
-//                    //绌烘墭鐩樿嚜鍔ㄥ叆搴�
-//                    mainService.autoEmptyIn();
 
 //                    // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
 //                    i++;
@@ -110,13 +136,18 @@
 //                    //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
 //                    mainService.scanBarcodeEmptyBoard();
 
-                    //鐮佸灈瀹屾垚椹卞姩鎵樼洏涓嬩竴姝ユ壂鐮佸叆搴�
-                    mainService.stackingCompletionDriveTray();
-                    //鎷嗗灈瀹屾垚缁х画涓嬩竴姝�
-                    mainService.stackingCompletionDriveTray2();
-                    //璐存爣瀹屾垚缁х画涓嬩竴姝�
-                    mainService.stackingCompletionDriveTray3();
-
+//                    //鐮佸灈瀹屾垚椹卞姩鎵樼洏涓嬩竴姝ユ壂鐮佸叆搴�
+//                    mainService.stackingCompletionDriveTray();
+//                    //鎷嗗灈瀹屾垚缁х画涓嬩竴姝�  鍑哄簱鑷虫湀鍙板嚭搴撳彛
+//                    mainService.stackingCompletionDriveTray2();
+//                    //璐存爣瀹屾垚缁х画涓嬩竴姝�
+////                    mainService.stackingCompletionDriveTray3();
+//                    //鎷嗗灈瀹屾垚缁х画涓嬩竴姝�  杩愯閫斾腑鑷姩閬胯绌烘澘
+//                    mainService.stackingCompletionDriveTray4();
+//                    //鎷嗗灈瀹屾垚鎵樼洏缁х画涓嬩竴姝�
+//                    mainService.stackingCompletionDriveTrayOk2();
+//                    //閫�璐х爜鍨涘畬鎴愭墭鐩樼户缁笅涓�姝�
+//                    mainService.stackingCompletionDriveTrayOk3();
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1