From 09fcc4ec56a1ce6c0fcb308348d8dd5e2c08d336 Mon Sep 17 00:00:00 2001
From: fyxc <fyxc@qq.com>
Date: 星期四, 22 五月 2025 14:33:06 +0800
Subject: [PATCH] server commit files
---
src/main/java/com/zy/core/MainProcess.java | 85 ++++++++++++++++++++----------------------
1 files changed, 41 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 4c2189a..c2c2871 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -28,76 +28,73 @@
/**
* =====>> 寮�濮嬪伐浣�
*/
- public void start(){
+ public void start() {
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
- // 闂撮殧
- Thread.sleep(300);
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
+ //鍒濆鍖栧疄鏃跺湴鍥�
+ mainService.initRealtimeBasMap();
- // 婕旂ず
- mainService.demo();
-
- // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
- mainService.generateStoreWrkFile(); // 缁勬墭
-// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
-
+ //zhangc
+ //杈撻�佺嚎
+ // 鍏ュ簱
+ mainService.generateInboundWrk();
+ mainService.noLiftIn();
// 闂撮殧
- Thread.sleep(500);
+ // 鍑哄簱
+ mainService.outFirst();
+ mainService.stnToOutStn();//杈撻�佺嚎
+ //杈撻�佺嚎瀹屾垚鍒ゆ柇
+ mainService.devpFinished();
- // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
- mainService.stnToCrnStnPick();
- // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
- mainService.crnStnToOutStn();
- // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
- mainService.crnIoExecute();
- // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
- mainService.shuttleIoInExecute();
- // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
- mainService.shuttleIoOutExecute();
+
+// // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
+// mainService.shuttleInExecute();
+// // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
+// mainService.shuttleOutExecute();
+ //鎻愬崌鏈哄叆搴撲换鍔�
+ mainService.liftInExecute();
+ // 闂撮殧
+ //鎻愬崌鏈哄嚭搴撲换鍔�
+ mainService.liftOutExecute();
+ // 闂撮殧
//鍥涘悜绌挎杞︿换鍔″畬鎴�
mainService.shuttleFinished();
- //鎻愬崌鏈轰换鍔�
- mainService.liftIoExecute();
+ // 闂撮殧
+ //鎵ц绉诲簱浠诲姟
+ mainService.shuttleLocMoveExecute();
+// //璐у弶鎻愬崌鏈轰换鍔�
+// mainService.forkLiftIoExecute();
+// //璐у弶鎻愬崌鏈轰换鍔″畬鎴�
+// mainService.forkLiftFinished();
+// //鎻愬崌鏈轰换鍔�
+// mainService.liftIoExecute();
//鎻愬崌鏈轰换鍔″畬鎴�
mainService.liftFinished();
- // 鍏ュ簱 ===>> 鎵ц鍫嗗灈鏈哄宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔
- mainService.storeFinished();
- // 鍏ュ簱 ===>> 鎵ц绌挎杞﹀宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔
- mainService.carGenerateStore();
+ // 闂撮殧
+ //鎵ц灏忚溅绉诲姩浠诲姟
+ mainService.shuttleMoveExecute();
// 寮傚父淇℃伅璁板綍
mainService.recErr();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
- mainService.storeEmptyPlt();
- // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
- mainService.ledExecute();
- // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
- mainService.ledReset();
// 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
mainService.loopShuttleCharge();
mainService.executeShuttleCharge();
- // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
- mainService.loopSteCharge();
- mainService.executeSteCharge();
- //鍑哄叆搴撴ā寮�
+
+ // 鍏朵粬 ===>> // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
i++;
if (i > 1) {
- mainService.outAndIn();
+ mainService.ioConvert();
i = 0;
}
// 闂撮殧
- Thread.sleep(200);
- // 绌挎杞� ===>> 灏忚溅澶嶄綅鑷冲緟鏈哄簱浣�
-// mainService.queryChargeLocOfComplete();
-// mainService.steFromChargeToIdleLoc();
-
+ Thread.sleep(300);
} catch (Exception e) {
e.printStackTrace();
}
@@ -107,7 +104,7 @@
}
@PreDestroy
- public void shutDown(){
+ public void shutDown() {
if (thread != null) thread.interrupt();
}
--
Gitblit v1.9.1