From 73024468df52927fc7fe116f9b4ba603f4b73eee Mon Sep 17 00:00:00 2001
From: cp <513960435@qq,com>
Date: 星期三, 17 一月 2024 10:49:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index ffe74e2..c7ca12f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -5,9 +5,11 @@
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涓绘祦绋�
@@ -22,6 +24,8 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
+ // 棰戠巼
+ private int i = 0;
/**
* =====>> 寮�濮嬪伐浣�
@@ -30,12 +34,22 @@
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
+
+ // 闂撮殧
+ Thread.sleep(1000);
+
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
+
+ // 婕旂ず
+ //mainService.crnDemoOfLocMove1();
+// // 婕旂ず 鎵�鏈夊簱浣嶈疆璇�
+// mainService.crnDemoOfLocMove2();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
- mainService.generateStoreWrkFile();
+ mainService.generateStoreWrkFile(); // 缁勬墭
+// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
mainService.stnToCrnStnPick();
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
@@ -44,15 +58,26 @@
mainService.crnIoExecute();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
+
+ //RGV鎼繍
+ mainService.rgvIoExecute();
+ //RGV宸ヤ綔瀹屾垚
+ mainService.rgvFinished();
+
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr();
-
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
- mainService.storeEmptyPlt();
+ mainService.storeEmptyPlt(); // 绌烘澘鍏ュ簱
+ // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
+ mainService.ledExecute();
+ // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+ mainService.ledReset();
- // 闂撮殧
- Thread.sleep(1500);
- log.info("WCS 宸ヤ綔涓� .....................");
+ //鎵弿纰熺洏鏈鸿嚜鍔ㄥ叆搴撶┖鎵樼洏
+ mainService.autoEmptyIn();
+ //鎵弿鎷嗙洏鏈鸿嚜鍔ㄥ嚭搴撶┖鎵樼洏
+ mainService.autoEmptyOut();
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1