From 496893a502fd4edd3546dfea38b4418232e18699 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期三, 10 七月 2024 14:39:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 451beab..0395337 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -65,41 +65,41 @@
// mainService.ioConvert();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
-// 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();
+ 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璋冨害************************************/
//JarWrkMastExecute浠诲姟瀹屾垚
@@ -108,8 +108,12 @@
mainService.jarWrkMastExecuteGenerate(k);
//JarWrkMastExecute浠诲姟鎵ц
mainService.jarWrkMastExecuteAction(k,j);
- //Jar浠诲姟鍒涘缓 //瀹屾垚
+ //Jar浠诲姟鍒涘缓
mainService.jarMastGenerate();
+ //Jar浠诲姟瀹屾垚
+ mainService.jarMastGenerateComplete();
+
+
/************************************JAR璋冨害************************************/
--
Gitblit v1.9.1