From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/core/MainProcess.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 0a93935..532654f 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涓绘祦绋�
@@ -30,11 +28,10 @@
/**
* =====>> 寮�濮嬪伐浣�
*/
- public void start(){
+ public void start() {
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
-
// 闂撮殧
Thread.sleep(1000);
@@ -42,31 +39,32 @@
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
+ // 璺戝簱绋嬪簭.鏈皟璇曟祴璇�
+ //mainService.debug("F");
+ //鐙珛杈撻�佺嚎浠诲姟.鏈皟璇曟祴璇�
+ //mainService.transferTaskStart();
+ //mainService.transferTaskEnd();
- // 婕旂ず
-// mainService.crnDemoOfLocMove1();
+
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
-// mainService.generateStoreWrkFile(); // 缁勬墭
+ mainService.generateStoreWrkFile(); // 缁勬墭
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
mainService.crnIoExecute();
- // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+ // 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-// mainService.storeEmptyPlt();
-
-// mainService.outOfDevp();
// 鍏朵粬 ===>> // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
- i++;
- if (i > 1) {
+// i++;
+// if (i > 1) {
// mainService.ioConvert();
- i = 0;
- }
+// i = 0;
+// }
+
} catch (Exception e) {
e.printStackTrace();
@@ -77,7 +75,7 @@
}
@PreDestroy
- public void shutDown(){
+ public void shutDown() {
if (thread != null) thread.interrupt();
}
--
Gitblit v1.9.1