From 5ab0056ca5a7f1501bce4783db289e3e94de62b0 Mon Sep 17 00:00:00 2001 From: cpT <1@123> Date: 星期六, 28 六月 2025 12:49:32 +0800 Subject: [PATCH] #改造 --- src/main/java/com/zy/core/MainProcess.java | 57 +++++++++++++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java index 93af98e..cf57af9 100644 --- a/src/main/java/com/zy/core/MainProcess.java +++ b/src/main/java/com/zy/core/MainProcess.java @@ -22,6 +22,7 @@ private MainServiceImpl mainService; // 鎵�灞炵嚎绋� private Thread thread; + private Thread thread2; /** * =====>> 寮�濮嬪伐浣� @@ -30,52 +31,60 @@ thread = new Thread(() -> { while (!Thread.currentThread().isInterrupted()) { try { - // 闂撮殧 - Thread.sleep(1000); - + Thread.sleep(400); // 绯荤粺杩愯鐘舵�佸垽鏂� if (!SystemProperties.WCS_RUNNING_STATUS.get()) { continue; } - - // 婕旂ず - mainService.crnDemoOfLocMove1(); - // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁� -// mainService.ioConvert(); // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。 mainService.generateStoreWrkFile(); // 缁勬墭 - mainService.generateStoreWrkFile0(); // WMS鍏ュ簱 - // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱 - mainService.stnToCrnStnPick(); - // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯 - mainService.crnStnToOutStn(); +// mainService.generateStoreWrkFileIsEmptyMk(); // 缁勬墭 绌烘墭 + mainService.generateStoreWrkFileWalk(); // 浠诲姟涓嬪彂 // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 mainService.crnIoExecute(); - // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵�� -// mainService.crnIoWrkMast(); // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣� mainService.storeFinished(); - // 鍫嗗灈鏈哄紓甯镐俊鎭褰� - mainService.recCrnErr(); - // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐� -// mainService.storeEmptyPlt(); - // 鍑哄簱 ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣� - mainService.ledExecute(); - // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅 - mainService.ledReset(); - + // 浠诲姟涓嬪彂 + mainService.taskStart(); } catch (Exception e) { e.printStackTrace(); } } }); thread.start(); + + thread2 = new Thread(() -> { + while (!Thread.currentThread().isInterrupted()) { + try { + // 闂撮殧 + Thread.sleep(200); + // 绯荤粺杩愯鐘舵�佸垽鏂� + if (!SystemProperties.WCS_RUNNING_STATUS.get()) { + continue; + } + // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯 + mainService.crnStnToOutStn(); + // 鍫嗗灈鏈哄紓甯镐俊鎭褰� + mainService.recCrnErr(); + // 鍑哄簱 ===>> 鍫嗗灈鏈�5鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣 +// mainService.crnStnToOutStnSou(); + // 鍑哄簱 ===>> 宸ヤ綔妗d俊鎭啓鍏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