From 2de4173f02cc9525949eb20e60595019b9be9a3f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 六月 2025 19:43:05 +0800
Subject: [PATCH] 部署服务器

---
 src/main/java/com/zy/core/MainProcess.java |  101 +++++++++++++++++++-------------------------------
 1 files changed, 38 insertions(+), 63 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 4a11259..071347c 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -29,99 +29,74 @@
     /**
      * =====>>  寮�濮嬪伐浣�
      */
-    public void start(){
+    public void start() throws InterruptedException {
         thread = new Thread(() -> {
+            // 鍒濆鍖栫綈瑁呯嚎鍑哄簱鍙f槸鍚﹀彲鍑�
             while (!Thread.currentThread().isInterrupted()) {
                 try {
-
-                    // 闂撮殧
                     Thread.sleep(1000);
 
                     // 绯荤粺杩愯鐘舵�佸垽鏂�
                     if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
                         continue;
                     }
+                    if(rgcWrk) {
+                        Thread.sleep(3000);
+                        mainService.intiGzxkc();
+                        rgcWrk = false;
+                    }
 
-                    // 婕旂ず
-//                    mainService.crnDemoOfLocMove1();
-                    //鍒锋柊RGV鍦板浘
-//                    mainService.refreshRgvMap();
+                    // 鎵樼洏鍒拌揪rgv鎺ラ┏绔欑偣锛屾洿鏀瑰伐浣滄。鐘舵�佷负9.鍛煎彨RGV锛岀幆绌跨▼搴忚皟搴gv
+                    mainService.callRgv();
 
-                    // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
-//                    mainService.ioConvert();
+                    // rgv鏀捐揣瀹屾垚锛岀粰杈撻�佺嚎涓嬪彂浠诲姟
+                    mainService.rgvToDev();
 
-                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-//                    mainService.stnToCrnStnPick(3);
-//                    mainService.stnToCrnStnPick2();
+                    // 1090寮傚父鍙i噸鏂板叆搴撳垎閰嶅簱浣�
+                    mainService.abnormalMouthWarehousing();
+                    Thread.sleep(1000);
 
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(1); // 缁勬墭
-//                    mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
-                    Thread.sleep(500);
+
+                    Thread.sleep(1000);
+
+                    // 鐢熸垚 绌哄瓙/姣嶆墭鐩樺嚭搴撲换鍔�
+                    mainService.generateEmptyPalletStoreWrk();
+
+                    // 鍏ュ簱 ===>> 姣嶆墭鐩樺彔婊″叆搴�
+                    mainService.autoEmptyIn();
+                    Thread.sleep(1000);
+
+                    // 瀛愭墭鐩樺簳涓嬫瘝鎵樼洏鍥炲彔鐩樻満
+//                    mainService.motherTrayReflow();
 
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn(4);
+
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
                     mainService.crnIoExecute(5);
-                    // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
-//                    mainService.crnIoWrkMast();
+
                     // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
                     mainService.storeFinished(6);
+
+                    // 绌烘《鍒拌揪缃愯绾垮叆鍙� 鍛婅瘔缃愯绾垮叆搴撴《淇℃伅
+                    mainService.inGzxBefore();
+
+                    // 绌烘《缃愯瀹屾垚鍒拌揪缃愯绾垮嚭鍙� 瀹屾垚鐩翠緵缃愯绾夸换鍔″拰绌烘《鍑哄簱浠诲姟锛屽垱寤烘垚鍝佹《鍏ュ簱浠诲姟
+                    mainService.canningLineTaskFinish();
+                    Thread.sleep(1000);
+
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr(7);
-                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-//                    mainService.storeEmptyPlt(8);
+
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute(9);
+
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset();
 
                     mainService.outOfDevp(11);
-
-                    // 106鐢熸垚杞Щ浠诲姟
-                    mainService.autoMoveLoc();
-
-                    // 缁檖lc鍐欏紑闂ㄤ俊鍙�
-                    mainService.writePlc305();
-
-                    // 305鍏ュ簱璋冪敤搴曞骇鍒�305
-                    mainService.invokingBase();
-
-//                    if (i>10){
-//                        //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
-//                        mainService.autoEmptyOut();
-//                        //绌烘墭鐩樿嚜鍔ㄥ叆搴�
-//                        mainService.autoEmptyIn();
-//                        i=0;
-//                    }
-//                    i++;
-
-                    // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
-//                    i++;
-//                    if (i > 1) {
-//                        mainService.ioConvert();
-//                        i = 0;
-//                    }
-
-                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
-//
-                    //瀹屾垚灏忚溅浠诲姟
-//                    mainService.rgvCompleteWrkMastSta();
-
-//                    //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
-//                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�
-//                    mainService.rgvRunWrkMastEmptyStaTake();//鍙�
-//                    if (rgcWrk){
-//                        //鎵ц灏忚溅璐х墿鎼繍浠诲姟
-//                        mainService.rgvRunWrkMastFullSta();
-//                        rgcWrk = false;
-//                    }else {
-//                        mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
-//                        rgcWrk = true;
-//                    }
-
-
-                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1