From 15047d62d27fbe4f99b7f93292c2cf9709b7cc97 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 四月 2024 08:53:39 +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 | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 7ec2c53..88f8c0a 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
@@ -1,5 +1,6 @@
package com.zy.asrs.wcs.core;
+import com.zy.asrs.wcs.core.properties.SystemProperties;
import com.zy.asrs.wcs.core.service.impl.MainServiceImpl;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -35,25 +36,25 @@
// 闂撮殧
Thread.sleep(300);
-// // 绯荤粺杩愯鐘舵�佸垽鏂�
-// if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
-// continue;
-// }
-//
-// // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
-// mainService.generateInboundWrk(); // 缁勬墭
-//
-// // 闂撮殧
-// Thread.sleep(500);
-//
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+ continue;
+ }
+
+ // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
+ mainService.generateInboundWrk(); // 缁勬墭
+
+ // 闂撮殧
+ Thread.sleep(500);
+
// //鍒濆鍖栧疄鏃跺湴鍥�
// mainService.initRealtimeBasMap();
// // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
//// mainService.stnToCrnStnPick();
-// // 鍑哄簱 =====>>
-// mainService.generateOutboundWrkMast();
-// // 瑙ｆ瀽鍏ュ簱宸ヤ綔妗�
-// mainService.analyzeInBoundWrk();
+ // 鍑哄簱 =====>>
+ mainService.generateOutboundWrkMast();
+ // 瑙ｆ瀽鍏ュ簱宸ヤ綔妗�
+ mainService.analyzeInBoundTask();
// // 寮傚父淇℃伅璁板綍
// mainService.recErr();
// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
--
Gitblit v1.9.1