From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java
index c674ce2..3c7dae4 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java
@@ -51,10 +51,10 @@
// mainService.initRealtimeBasMap();
// // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
//// mainService.stnToCrnStnPick();
-// // 鍑哄簱 =====>>
-// mainService.generateOutboundWrkMast();
-// // 瑙ｆ瀽鍏ュ簱宸ヤ綔妗�
-// mainService.analyzeInBoundWrk();
+ // 鍑哄簱 =====>>
+ mainService.generateOutboundWrkMast();
+ // 瑙ｆ瀽鍏ュ簱宸ヤ綔妗�
+ mainService.analyzeInBoundTask();
// // 寮傚父淇℃伅璁板綍
// mainService.recErr();
// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
@@ -63,12 +63,10 @@
// mainService.ledExecute();
// // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
// mainService.ledReset();
-// // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
-// mainService.loopShuttleCharge();
-// // 绌挎杞� ===>> 灏忚溅鐢甸噺婊＄數鍚庡洖寰呮満浣�
-// mainService.loopShuttleToStandbyCauseCharge();
-// // 鎵弿宸茬粡鍦ㄥ嚭搴撳彛鐨勮揣鐗� => 鍛煎彨agv鑷虫斁璐х珯鐐�
-// mainService.scanOutCallAgv();
+ // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
+ mainService.loopShuttleCharge();
+ // 绌挎杞� ===>> 灏忚溅鐢甸噺婊＄數鍚庡洖寰呮満浣�
+ mainService.loopShuttleToStandbyCauseCharge();
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1