From dbb60e2e942adb7b16e33d5d51650319aaead683 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 06 八月 2024 14:05:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |  111 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 92 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 61a2b28..4a11259 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -1,6 +1,6 @@
 package com.zy.core;
 
-import com.zy.asrs.service.impl.MainServiceImpl;
+import com.zy.service.impl.MainServiceImpl;
 import com.zy.core.properties.SystemProperties;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +22,9 @@
     private MainServiceImpl mainService;
     // 鎵�灞炵嚎绋�
     private Thread thread;
+    // 棰戠巼
+    private int i = 0;
+    private boolean rgcWrk = true;
 
     /**
      * =====>>  寮�濮嬪伐浣�
@@ -30,26 +33,96 @@
         thread = new Thread(() -> {
             while (!Thread.currentThread().isInterrupted()) {
                 try {
-                    // 绯荤粺杩愯鐘舵�佸垽鏂�
-                    if (SystemProperties.WCS_RUNNING_STATUS.get()) {
-                        continue;
-                    }
-                    // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
-                    mainService.generateStoreWrkFile();
-                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-                    mainService.stnToCrnStnPick();
-                    // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
-                    mainService.crnStnToOutStn();
-                    // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
-                    mainService.crnIoExecute();
-                    // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
-                    mainService.storeFinished();
-                    // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
-                    mainService.recCrnErr();
 
                     // 闂撮殧
-                    Thread.sleep(1500);
-                    log.info("WCS 宸ヤ綔涓� .....................");
+                    Thread.sleep(1000);
+
+                    // 绯荤粺杩愯鐘舵�佸垽鏂�
+                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+                        continue;
+                    }
+
+                    // 婕旂ず
+//                    mainService.crnDemoOfLocMove1();
+                    //鍒锋柊RGV鍦板浘
+//                    mainService.refreshRgvMap();
+
+                    // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
+//                    mainService.ioConvert();
+
+                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+//                    mainService.stnToCrnStnPick(3);
+//                    mainService.stnToCrnStnPick2();
+
+                    // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
+                    mainService.generateStoreWrkFile(1); // 缁勬墭
+//                    mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
+                    Thread.sleep(500);
+
+                    // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
+                    mainService.crnStnToOutStn(4);
+                    // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
+                    mainService.crnIoExecute(5);
+                    // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
+//                    mainService.crnIoWrkMast();
+                    // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+                    mainService.storeFinished(6);
+                    // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
+                    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