From 1eee1c2af23940a6c2af5b519b65bdd1e7b4ac49 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 02 九月 2025 14:17:29 +0800
Subject: [PATCH] 去除多于代码，取消许可证校验
---
src/main/java/com/zy/core/MainProcess.java | 96 ++++--------------------------------------------
1 files changed, 8 insertions(+), 88 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 2a490f1..f95867a 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -1,15 +1,12 @@
package com.zy.core;
import com.zy.asrs.service.impl.MainServiceImpl;
-import com.zy.core.properties.SystemProperties;
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涓绘祦绋�
@@ -29,6 +26,7 @@
private int j = 0;
private int k = 0;
private int l = 0;
+ private int[] autoZ = new int[]{0,0,0,0,0,0,0};
/**
* =====>> 寮�濮嬪伐浣�
@@ -37,95 +35,17 @@
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
- i++; if (i>5) i=0;
- j++; if (j>5) j=0;
- k++;
- if (k>13) {
- k=0;
- l++;
- if (l>3) l=0;
- }
-
-
// 闂撮殧
- Thread.sleep(1000);
+ Thread.sleep(500);
- // 绯荤粺杩愯鐘舵�佸垽鏂�
- if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
- continue;
- }
+ // 灏忚溅鍙栬揣瓒婁綅,浠诲姟鍙栨秷
+ mainService.rgvTaskCancel();
- //鍒濆鍖朢GV鍦板浘
-// mainService.initRgvMap();
- //鍒锋柊RGV鍦板浘
-// mainService.refreshRgvMap();
- // 婕旂ず
-// mainService.crnDemoOfLocMove1();
- // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
-// mainService.ioConvert();
- // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
+ // 浠诲姟涓嬪彂
+ mainService.rgvTheHandlingTaskIsIssued();
- mainService.generateStoreWrkFile(); // 缁勬墭
- mainService.generateStoreWrkFileSingle(); // 缁勬墭 鍙屽伐浣嶅崟浼� 灏忔枡绠�
- mainService.generateStoreWrkFileLarge(); // 缁勬墭 鍙屽伐浣嶅崟浼� 澶ф枡绠�
-// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
-
- // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
- mainService.crnStnToOutStn();
- // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯 宸ヤ綅2
- mainService.crnStnToOutStnTwo();
- // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
- mainService.crnIoExecute();
- // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満
- mainService.crnIoExecuteTwo();
- // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満 鎷嗗垎鎵ц浠诲姟涓嬪彂
- mainService.crnIoExecuteTwoExecute(i);//Execute
- if (i%2==0){
- // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
- mainService.storeFinished();
- }else {
- // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣� 宸ヤ綅2
- mainService.storeFinishedTwo();
- }
-
-
-// // 寮傚父淇℃伅璁板綍
-// mainService.recErr();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱
- mainService.storeEmptyPlt();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱 鍙屽伐浣嶅崟浼� 灏忔枡绠�
- mainService.storeEmptyPltSingle();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱 鍙屽伐浣嶅崟浼� 澶ф枡绠�
- mainService.storeEmptyPltLarge();
- // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
- mainService.ledExecute();
- // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
- mainService.ledReset();
-
- /************************************JAR璋冨害************************************/
- mainService.stackingCompletionDriveTray();//鍒嗛厤纭寲缃�
-
- //Jar鍏呯數浠诲姟瀹屾垚
- mainService.jarChargeComplete();
- //JarWrkMastExecute浠诲姟瀹屾垚
- mainService.jarWrkMastExecuteGenerateComplete(k);
- //JarWrkMastExecute浠诲姟鍒涘缓 //纭寲缃�
- mainService.jarWrkMastExecuteGenerate(k);
- //JarWrkMastExecute浠诲姟鎵ц
- mainService.jarWrkMastExecuteAction(k,j);
- //Jar浠诲姟鍒涘缓
- mainService.jarMastGenerate();
- //Jar浠诲姟瀹屾垚
- mainService.jarMastGenerateComplete();
- //Jar鍏呯數浠诲姟鍒涘缓
- mainService.jarChargeGenerate();
-
-
-
-
-
- /************************************JAR璋冨害************************************/
-
+ // 浠诲姟瀹屾垚
+ mainService.rgvCompleteWrkMastSta(autoZ);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1