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 | 68 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 504427f..84155f8 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -28,6 +28,7 @@
private int i = 0;
private int j = 0;
private int k = 0;
+ private int l = 0;
/**
* =====>> 寮�濮嬪伐浣�
@@ -36,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);
@@ -54,10 +64,11 @@
// 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
// mainService.ioConvert();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
+
mainService.generateStoreWrkFile(); // 缁勬墭
mainService.generateStoreWrkFileSingle(); // 缁勬墭 鍙屽伐浣嶅崟浼� 灏忔枡绠�
mainService.generateStoreWrkFileLarge(); // 缁勬墭 鍙屽伐浣嶅崟浼� 澶ф枡绠�
- mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn();
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯 宸ヤ綅2
@@ -67,7 +78,7 @@
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満
mainService.crnIoExecuteTwo();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満 鎷嗗垎鎵ц浠诲姟涓嬪彂
- mainService.crnIoExecuteTwoExecute();//Execute
+ mainService.crnIoExecuteTwoExecute(i);//Execute
if (i%2==0){
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
@@ -76,34 +87,6 @@
mainService.storeFinishedTwo();
}
- /************************************RGV璋冨害************************************/
- i++;
- k++;
- if (i<8) {
-// // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
-// if (i == 7) {
-// try{
-// boolean rgvIoExecuteSign = mainService.rgvIoExecute(i); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
-// if (rgvIoExecuteSign){
-// k = 0;
-// } else if (k>8){
-// k = 0;
-// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
-// }
-// }catch (Exception e){
-// log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
-// }
-// }else {
-// //绌挎鏉�
-//// boolean rgvIoExecuteSign = mainService.rgvIoExecute(i); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
-//
-// }
- }else {
- i = 0;
- }
-// //瀹屾垚灏忚溅浠诲姟
- mainService.rgvCompleteWrkMastSta();
- /************************************RGV璋冨害************************************/
// // 寮傚父淇℃伅璁板綍
// mainService.recErr();
@@ -115,9 +98,32 @@
mainService.storeEmptyPltLarge();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
- // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+ // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
+ /************************************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();
+
+
+
+
+
+ /************************************JAR璋冨害************************************/
+
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1