From 658b3d9b66b11001935317c04521c7a37ce97db1 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期一, 15 七月 2024 10:11:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 92 ++++++++++++++++++++++++++++++++++------------
1 files changed, 68 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c5b90fb..84155f8 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.PreDestroy;
+import java.util.ArrayList;
/**
* WCS涓绘祦绋�
@@ -23,9 +24,11 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
- @Value("${crnBackHp.enable}")
- private boolean crnBackHp;
- private boolean look = true;
+ // 棰戠巼
+ private int i = 0;
+ private int j = 0;
+ private int k = 0;
+ private int l = 0;
/**
* =====>> 寮�濮嬪伐浣�
@@ -34,6 +37,15 @@
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);
@@ -43,42 +55,74 @@
continue;
}
+ //鍒濆鍖朢GV鍦板浘
+// mainService.initRgvMap();
+ //鍒锋柊RGV鍦板浘
+// mainService.refreshRgvMap();
// 婕旂ず
- mainService.crnDemoOfLocMove1();
+// mainService.crnDemoOfLocMove1();
// 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
// mainService.ioConvert();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
+
mainService.generateStoreWrkFile(); // 缁勬墭
- mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
- // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
- mainService.stnToCrnStnPick();
+ mainService.generateStoreWrkFileSingle(); // 缁勬墭 鍙屽伐浣嶅崟浼� 灏忔枡绠�
+ mainService.generateStoreWrkFileLarge(); // 缁勬墭 鍙屽伐浣嶅崟浼� 澶ф枡绠�
+// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn();
+ // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯 宸ヤ綅2
+ mainService.crnStnToOutStnTwo();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
mainService.crnIoExecute();
- // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
-// mainService.crnIoWrkMast();
- // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
- mainService.storeFinished();
- // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
- mainService.recCrnErr();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-// mainService.storeEmptyPlt();
+ // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満
+ 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鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+ // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
-// if (crnBackHp) {
-// if (look) {
-// //鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃澶囧瓨鍦ㄥ叆搴撲换鍔℃椂鍙洖鍘熺偣
-// mainService.crnRebackHp();
-// }
-// }
-// look = !look;
+ /************************************JAR璋冨害************************************/
+ //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();
- mainService.outOfDevp();
+
+
+
+ /************************************JAR璋冨害************************************/
+
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1