From ffc3b1151655f258fb1db0b24c3434bd294b0598 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 05 十月 2025 10:35:32 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/core/MainProcess.java | 56 +++++++++++++++++++-------------------------------------
1 files changed, 19 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index ac59b57..dfc6741 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -5,11 +5,9 @@
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()) {
@@ -46,15 +44,19 @@
// 婕旂ず
mainService.crnDemoOfLocMove1();
- //鍒锋柊RGV鍦板浘
- mainService.refreshRgvMap();
// 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
// mainService.ioConvert();
+
+
+ // mainService.stnToCrnStnPick2();
+
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(1); // 缁勬墭
- mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
- Thread.sleep(500);
+// mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
+ Thread.sleep(200);
+
+
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
mainService.stnToCrnStnPick(3);
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
@@ -71,46 +73,26 @@
mainService.storeEmptyPlt(8);
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute(9);
+// if(MessageQueue.offer(SlaveType.Led, 1, new Task(3, "鏉＄爜宸插瓨鍦ㄧ姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑浠诲姟,宸ヤ綔鍙�="))){
+// News.info("杈撳叆鎴愬姛");
+// }
+ //鍫嗗灈鏈烘棤浠诲姟鍥炲叆搴撳彛寰呮満
+ //mainService.crnMove();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
- mainService.outOfDevp(11);
+
+// mainService.outOfDevp(11);
if (i>10){
//绌烘墭鐩樿嚜鍔ㄥ嚭搴�
- mainService.autoEmptyOut();
- //绌烘墭鐩樿嚜鍔ㄥ叆搴�
- mainService.autoEmptyIn();
+// 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