From 21b1fd74f475efd91d16a815464debab860a97a2 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 23 五月 2024 16:42:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++
src/main/java/com/zy/core/MainProcess.java | 72 +++++++----------------------------
2 files changed, 19 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index e7993b7..ceb91ec 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4725,6 +4725,8 @@
case 6:////鎻愬崌
// signWork = qwe();
break;
+ case 7:////浣嶇Щ
+ break;
default:
break;
}
@@ -4748,6 +4750,8 @@
case 6:////鎻愬崌
// signWork = rgvRunWrkMastEmptyStaPut();
break;
+ case 7:////浣嶇Щ
+ break;
default:
break;
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index f671080..a140f77 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -57,15 +57,7 @@
mainService.generateStoreWrkFile(); // 缁勬墭
mainService.generateStoreWrkFileSingle(); // 缁勬墭 鍙屽伐浣嶅崟浼� 灏忔枡绠�
mainService.generateStoreWrkFileLarge(); // 缁勬墭 鍙屽伐浣嶅崟浼� 澶ф枡绠�
- // 鍏ュ簱 ===>> 鐮佸灈浣嶈幏鍙栫┖鏉挎潯鐮佷俊鎭�
-// mainService.generateStoreWrkFileFull2LouM(); // 缁勬墭
mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
- // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-// mainService.stnToCrnStnPick();
- // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖� 1妤兼媶鍨涗綅缃�
-// mainService.stnToCrnStnPick2();
- // 2妤�212鍛煎彨绌烘澘
-// mainService.stnToCrnStnPick3Auto(i);
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn();
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯 宸ヤ綅2
@@ -74,35 +66,33 @@
mainService.crnIoExecute();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満
mainService.crnIoExecuteTwo();
- // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
-// mainService.crnIoWrkMast();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣� 宸ヤ綅2
mainService.storeFinishedTwo();
-// /////////////////////////////////////RGV璋冨害/////////////////////////////////////
- i++;
- k++;
- if (i<7) {
- // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
- try{
-// boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
+ /************************************RGV璋冨害************************************/
+// i++;
+// k++;
+// if (i<7) {
+// // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
+// try{
+ boolean rgvIoExecuteSign = mainService.rgvIoExecute(7); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
// if (rgvIoExecuteSign){
// k = 0;
// } else if (k>7){
// k = 0;
// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
// }
- }catch (Exception e){
- log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
- }
- }else {
- i = 0;
- }
+// }catch (Exception e){
+// log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+// }
+// }else {
+// i = 0;
+// }
// //瀹屾垚灏忚溅浠诲姟
-// mainService.rgvCompleteWrkMastSta();
-// /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+ mainService.rgvCompleteWrkMastSta();
+ /************************************RGV璋冨害************************************/
// // 寮傚父淇℃伅璁板綍
// mainService.recErr();
@@ -112,42 +102,10 @@
mainService.storeEmptyPltSingle();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱 鍙屽伐浣嶅崟浼� 澶ф枡绠�
mainService.storeEmptyPltLarge();
-// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満绌烘澘鍏ュ簱
-// mainService.storeEmptyPlt3();
-// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
-// mainService.storeEmptyPlt2();
-// // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖� 1妤兼媶鍨涗綅缃� 绌烘澘鍙犵洏
-// mainService.storeEmptyPlt4();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
-
-// // 鍏朵粬 ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
-// i++;
-// if (i > 1) {
-// mainService.ioConvert();
-// i = 0;
-// }
-
- //鐮佸灈浣嶈嚜鍔ㄨˉ鍏呯┖鏉匡細椹卞姩鎷嗙洏鏈鸿緭鍑烘墭鐩�
-// mainService.dischargingMachineOutputTray();
-
-// //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
-// mainService.scanBarcodeEmptyBoard();
-
-// //鐮佸灈瀹屾垚椹卞姩鎵樼洏涓嬩竴姝ユ壂鐮佸叆搴�
-// mainService.stackingCompletionDriveTray();
-// //鎷嗗灈瀹屾垚缁х画涓嬩竴姝� 鍑哄簱鑷虫湀鍙板嚭搴撳彛
-// mainService.stackingCompletionDriveTray2();
-// //璐存爣瀹屾垚缁х画涓嬩竴姝�
-//// mainService.stackingCompletionDriveTray3();
-// //鎷嗗灈瀹屾垚缁х画涓嬩竴姝� 杩愯閫斾腑鑷姩閬胯绌烘澘
-// mainService.stackingCompletionDriveTray4();
-// //鎷嗗灈瀹屾垚鎵樼洏缁х画涓嬩竴姝�
-// mainService.stackingCompletionDriveTrayOk2();
-// //閫�璐х爜鍨涘畬鎴愭墭鐩樼户缁笅涓�姝�
-// mainService.stackingCompletionDriveTrayOk3();
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1