From 712dcbef9f4ae3f81e751bf8651d2e241f3f792c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 21 十月 2025 15:40:49 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/MainProcess.java | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index b213ca1..bb10ff6 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涓绘祦绋�
@@ -24,8 +22,7 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
- // 棰戠巼
- private int i = 0;
+ private Thread thread2;
/**
* =====>> 寮�濮嬪伐浣�
@@ -34,54 +31,62 @@
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
-
// 闂撮殧
Thread.sleep(1000);
-
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
-
- // 婕旂ず
-// mainService.crnDemoOfLocMove1();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(); // 缁勬墭
- // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
- mainService.crnStnToOutStn();
+// mainService.generateStoreWrkFileIsEmptyMk(); // 缁勬墭 绌烘墭
+ mainService.generateStoreWrkFileWalk(); // wms鍏ュ簱浠诲姟涓嬪彂
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
mainService.crnIoExecute();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
-
- // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
- mainService.recCrnErr();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-// mainService.storeEmptyPlt();
-
-// mainService.outOfDevp();
-
- // 鍏朵粬 ===>> // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
- i++;
- if (i > 1) {
-// mainService.ioConvert();
- i = 0;
- }
-
- //鑷姩娲惧彂浠诲姟
- mainService.autoDistribute();
-
+ // 浠诲姟涓嬪彂
+ mainService.taskStart();
+ // 鍑哄簱 ===>> 鍫嗗灈鏈�2鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣
+ mainService.crnStnToOutStnSou();
} catch (Exception e) {
e.printStackTrace();
}
}
});
thread.start();
+
+ thread2 = new Thread(() -> {
+ while (!Thread.currentThread().isInterrupted()) {
+ try {
+ // 闂撮殧
+ Thread.sleep(400);
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+ continue;
+ }
+ // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
+ mainService.crnStnToOutStn();
+ // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
+ mainService.recCrnErr();
+ // 杈撻�佺嚎寮傚父淇℃伅璁板綍
+// mainService.recDevErr();
+ // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
+// mainService.ledExecute(9);
+ // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+// mainService.ledReset(10);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ thread2.start();
}
@PreDestroy
public void shutDown(){
if (thread != null) thread.interrupt();
+ if (thread2 != null) thread2.interrupt();
}
}
--
Gitblit v1.9.1