From dfafabacf23bf22181d7c3f3665e684be7921f7d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 07 八月 2024 16:45:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |   49 ++++++++++++++++++++++++++++++++-----------------
 1 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 7a40880..4a11259 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -1,15 +1,13 @@
 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;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PreDestroy;
-import java.util.ArrayList;
 
 /**
  * WCS涓绘祦绋�
@@ -37,7 +35,7 @@
                 try {
 
                     // 闂撮殧
-                    Thread.sleep(500);
+                    Thread.sleep(1000);
 
                     // 绯荤粺杩愯鐘舵�佸垽鏂�
                     if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
@@ -45,18 +43,22 @@
                     }
 
                     // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
+//                    mainService.crnDemoOfLocMove1();
                     //鍒锋柊RGV鍦板浘
-                    mainService.refreshRgvMap();
+//                    mainService.refreshRgvMap();
 
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
+
+                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+//                    mainService.stnToCrnStnPick(3);
+//                    mainService.stnToCrnStnPick2();
+
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(1); // 缁勬墭
-                    mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
+//                    mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
                     Thread.sleep(500);
-                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-                    mainService.stnToCrnStnPick(3);
+
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn(4);
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -68,18 +70,31 @@
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr(7);
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-                    mainService.storeEmptyPlt(8);
+//                    mainService.storeEmptyPlt(8);
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute(9);
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
-                    mainService.ledReset(10);
+                    mainService.ledReset();
 
                     mainService.outOfDevp(11);
 
-                    //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
-                    mainService.autoEmptyOut();
-//                    //绌烘墭鐩樿嚜鍔ㄥ叆搴�
-//                    mainService.autoEmptyIn();
+                    // 106鐢熸垚杞Щ浠诲姟
+                    mainService.autoMoveLoc();
+
+                    // 缁檖lc鍐欏紑闂ㄤ俊鍙�
+                    mainService.writePlc305();
+
+                    // 305鍏ュ簱璋冪敤搴曞骇鍒�305
+                    mainService.invokingBase();
+
+//                    if (i>10){
+//                        //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
+//                        mainService.autoEmptyOut();
+//                        //绌烘墭鐩樿嚜鍔ㄥ叆搴�
+//                        mainService.autoEmptyIn();
+//                        i=0;
+//                    }
+//                    i++;
 
                     // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
 //                    i++;
@@ -91,14 +106,14 @@
                     /////////////////////////////////////RGV璋冨害/////////////////////////////////////
 //
                     //瀹屾垚灏忚溅浠诲姟
-                    mainService.rgvCompleteWrkMastSta();
+//                    mainService.rgvCompleteWrkMastSta();
 
 //                    //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
 //                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�
 //                    mainService.rgvRunWrkMastEmptyStaTake();//鍙�
 //                    if (rgcWrk){
 //                        //鎵ц灏忚溅璐х墿鎼繍浠诲姟
-                        mainService.rgvRunWrkMastFullSta();
+//                        mainService.rgvRunWrkMastFullSta();
 //                        rgcWrk = false;
 //                    }else {
 //                        mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯

--
Gitblit v1.9.1