From c9b270dae703ee077a4e41013d7662c5e61afd29 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 26 五月 2025 23:02:15 +0800
Subject: [PATCH] #ZH
---
src/main/java/com/zy/core/MainProcess.java | 83 +++++++++++++----------------------------
1 files changed, 26 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index e25cfac..2bca69b 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -26,78 +26,47 @@
private Thread thread;
// 棰戠巼
private int i = 0;
+ private int j = 0;
+ private int k = 0;
+ private int l = 0;
+ private int[] autoZ = new int[]{0,0,0,0,0,0,0};
/**
* =====>> 寮�濮嬪伐浣�
*/
public void start(){
thread = new Thread(() -> {
+ try{
+ Thread.sleep(200);
+ log.info("++++++++ 寮�濮嬮獙璇佽鍙瘉 ++++++++");
+ if (!mainService.licenseVerify()){
+ SystemProperties.WCS_RUNNING_STATUS.set(Boolean.FALSE);
+ log.info("++++++++ 楠岃瘉璁稿彲璇佸け璐� ++++++++");
+ } else {
+ SystemProperties.WCS_RUNNING_STATUS.set(Boolean.TRUE);
+ log.info("++++++++ 楠岃瘉璁稿彲璇佹垚鍔� ++++++++");
+ }
+ } catch (Exception e) {}
while (!Thread.currentThread().isInterrupted()) {
try {
-
// 闂撮殧
- Thread.sleep(1000);
+ Thread.sleep(200);
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
- //鍒濆鍖朢GV鍦板浘
- mainService.initRgvMap();
- // 婕旂ず
- mainService.crnDemoOfLocMove1();
- // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
-// mainService.ioConvert();
- // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
- mainService.generateStoreWrkFile(); // 缁勬墭
- mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
- // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
- mainService.stnToCrnStnPick();
- // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
- mainService.crnStnToOutStn();
- // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
- mainService.crnIoExecute();
- // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
-// mainService.crnIoWrkMast();
- // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
- mainService.storeFinished();
-
- ///////////////////////RGV璋冨害/////////////////////////////////////
- //缁戝畾灏忚溅鏂规硶
- mainService.rgvBindSte();
- // 鍏ュ嚭搴� ===>> RGV鍏ュ嚭搴撲綔涓氫笅鍙�
- mainService.rgvIoExecute();
- // RGV鍏ュ簱 ===>> 鏍规嵁RGV瀹屾垚淇″彿,鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
- mainService.rgvFinished();
-// // 鍏ュ嚭搴� ===>> RGV鍑哄簱绔欏埌绯荤粺鍏ュ嚭搴撶珯
-// mainService.rgvDestStnToCrnStn();
-// // 鍑哄簱 ===>> RGV鍑哄簱绔欏埌绯荤粺鍑哄簱绔�
-// mainService.rgvOutDStnToOutStn();
- //////////////////////////////////////////////////////////////////
-
- // 寮傚父淇℃伅璁板綍
- mainService.recErr();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
- mainService.storeEmptyPlt();
- // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
- mainService.ledExecute();
- // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
- mainService.ledReset();
-
- mainService.outOfDevp();
-
- //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
- mainService.autoEmptyOut();
-// //绌烘墭鐩樿嚜鍔ㄥ叆搴�
-// mainService.autoEmptyIn();
-
- // 鍏朵粬 ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
- i++;
- if (i > 1) {
- mainService.ioConvert();
- i = 0;
- }
+ //鏇存柊浣嶇疆淇℃伅
+ mainService.updateStePositionNearby();
+ //鏇存柊浣嶇疆淇℃伅
+ mainService.updateStePosition();
+ // 浠诲姟涓嬪彂
+ mainService.DevpTaskNoRun();
+ // 浠诲姟瀹屾垚
+ mainService.rgvCompleteWrkMastSta(autoZ);
+ //鏇存柊浣嶇疆淇℃伅
+ mainService.updateStePosition();
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1