From 0613172a33ffc4eb4f21c36bd05a39b176999bbd Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 六月 2024 08:35:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 119 +++++++++++++++++++++++++++--------------------------------
1 files changed, 55 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index ca6aadc..504427f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -26,6 +26,8 @@
private Thread thread;
// 棰戠巼
private int i = 0;
+ private int j = 0;
+ private int k = 0;
/**
* =====>> 寮�濮嬪伐浣�
@@ -45,87 +47,76 @@
//鍒濆鍖朢GV鍦板浘
// mainService.initRgvMap();
- mainService.refreshRgvMap();
+ //鍒锋柊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.crnIoExecuteTwo();
+ // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満 鎷嗗垎鎵ц浠诲姟涓嬪彂
+ mainService.crnIoExecuteTwoExecute();//Execute
+ if (i%2==0){
+ // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+ mainService.storeFinished();
+ }else {
+ // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣� 宸ヤ綅2
+ mainService.storeFinishedTwo();
+ }
- /////////////////////////////////////RGV璋冨害/////////////////////////////////////
-
-// //缁戝畾灏忚溅鏂规硶
-// mainService.rgvBindSte();
-// mainService.rgvBindSte2();
-//// // 鍏ュ嚭搴� ===>> RGV鍏ュ嚭搴撲綔涓氫笅鍙�
-// mainService.rgvIoExecute();
-// // RGV鍏ュ簱 ===>> 鏍规嵁RGV瀹屾垚淇″彿,鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
-// mainService.rgvFinished();
-// // 鍏ュ嚭搴� ===>> RGV鍑哄簱绔欏埌绯荤粺鍏ュ嚭搴撶珯
-// mainService.rgvDestStnToCrnStn();
-// // 鍑哄簱 ===>> RGV鍑哄簱绔欏埌绯荤粺鍑哄簱绔�
-// mainService.rgvOutDStnToOutStn();
-
- //瀹屾垚灏忚溅浠诲姟
+ /************************************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();
- //鎵ц灏忚溅璐х墿鎼繍浠诲姟
- mainService.rgvRunWrkMastFullSta();
- //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
- mainService.rgvRunWrkMastEmptyStaPut();//鏀�
- mainService.rgvRunWrkMastEmptyStaTake();//鍙�
- mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+ /************************************RGV璋冨害************************************/
-
- /////////////////////////////////////RGV璋冨害/////////////////////////////////////
-
- // 寮傚父淇℃伅璁板綍
- mainService.recErr();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
+// // 寮傚父淇℃伅璁板綍
+// mainService.recErr();
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱
mainService.storeEmptyPlt();
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱 鍙屽伐浣嶅崟浼� 灏忔枡绠�
+ mainService.storeEmptyPltSingle();
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱 鍙屽伐浣嶅崟浼� 澶ф枡绠�
+ mainService.storeEmptyPltLarge();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
-
-// mainService.outOfDevp();
-
-// //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
-// mainService.autoEmptyOut();
-// //绌烘墭鐩樿嚜鍔ㄥ叆搴�
-// mainService.autoEmptyIn();
-
-// // 鍏朵粬 ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
-// i++;
-// if (i > 1) {
-// mainService.ioConvert();
-// i = 0;
-// }
-
- //鐮佸灈浣嶈嚜鍔ㄨˉ鍏呯┖鏉匡細椹卞姩鎷嗙洏鏈鸿緭鍑烘墭鐩�
-// mainService.dischargingMachineOutputTray();
-
-// //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
-// mainService.scanBarcodeEmptyBoard();
-
- //鐮佸灈瀹屾垚椹卞姩鎵樼洏涓嬩竴姝ユ壂鐮佸叆搴�
- mainService.stackingCompletionDriveTray();
- //鎷嗗灈瀹屾垚缁х画涓嬩竴姝�
- mainService.stackingCompletionDriveTray2();
- //璐存爣瀹屾垚缁х画涓嬩竴姝�
- mainService.stackingCompletionDriveTray3();
-
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1