From 0d04bc5d8080b82338302fba0a59fccff2eaedfc Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期日, 06 七月 2025 11:28:29 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 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 dfe6aa0..22be433 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 @@ -5,9 +5,12 @@ import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import javax.annotation.PreDestroy; +import java.text.SimpleDateFormat; +import java.util.Date; /** * WCS涓绘祦绋� @@ -20,6 +23,8 @@ @Autowired private MainServiceImpl mainService; + @Value("${tmpLincense}") + private Date tmpLincense; // 鎵�灞炵嚎绋� private Thread thread; // 棰戠巼 @@ -41,27 +46,34 @@ continue; } + if(System.currentTimeMillis() - tmpLincense.getTime() > 1000){ + continue; + } + //鍒濆鍖栧疄鏃跺湴鍥� mainService.initRealtimeBasMap(); - // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。 mainService.generateInboundWrk(); // 缁勬墭 // 瑙f瀽鍑哄簱宸ヤ綔妗� - mainService.generateOutboundWrkMast(); + mainService.analyzeOutBoundTask(); // 瑙f瀽鍏ュ簱宸ヤ綔妗� mainService.analyzeInBoundTask(); + // 瑙f瀽灏忚溅绉诲姩宸ヤ綔妗� + mainService.analyzeMoveTask(); + // 瑙f瀽灏忚溅杞借揣绉诲姩宸ヤ綔妗� + mainService.analyzeLadenMoveTask(); // 鍑哄簱 ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣� - mainService.ledExecute(); +// mainService.ledExecute(); // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅 - mainService.ledReset(); +// mainService.ledReset(); // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢� mainService.loopShuttleCharge(); // 绌挎杞� ===>> 灏忚溅鐢甸噺婊$數鍚庡洖寰呮満浣� mainService.loopShuttleToStandbyCauseCharge(); } catch (Exception e) { - e.printStackTrace(); + log.error("fail", e); } } }); -- Gitblit v1.9.1