From 488b3ded577e759fc6f77ac68768c66c39560566 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 13 六月 2025 09:41:26 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/MainProcess.java | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 58f36e8..8d87aca 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -1,13 +1,18 @@
package com.zy.core;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.core.properties.SystemProperties;
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.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* WCS涓绘祦绋�
@@ -22,33 +27,55 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
+ // 棰戠巼
+ private int[] autoZ = new int[]{0,0,0,0,0,0,0};
/**
* =====>> 寮�濮嬪伐浣�
*/
public void start(){
thread = new Thread(() -> {
+ try{
+ Thread.sleep(200);
+ log.info("++++++++ 寮�濮嬮獙璇佽鍙瘉 ++++++++");
+ if (!mainService.licenseVerify()){
+ SystemProperties.WCS_RUNNING_STATUS.set(Boolean.FALSE);
+ log.info("++++++++ 楠岃瘉璁稿彲璇佸け璐� ++++++++");
+ } else {
+ SystemProperties.WCS_RUNNING_STATUS.set(Boolean.TRUE);
+ log.info("++++++++ 楠岃瘉璁稿彲璇佹垚鍔� ++++++++");
+ }
+ } catch (Exception e) {}
while (!Thread.currentThread().isInterrupted()) {
try {
+ // 闂撮殧
+ Thread.sleep(200);
+
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
- // 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗ｏ紝宸ヤ綔鐘舵��1锛屾棤璁惧鍛戒护涓嬪彂
- mainService.generateStoreWrkFile();
+ //鏇存柊浣嶇疆淇℃伅
+ mainService.updateStePosition();
+ // 浠诲姟鎺掑簭
+ List<List<List<WrkMast>>> wrkMastListAll = mainService.DevpTaskNoRun();
+ // 浠诲姟涓嬪彂
+ mainService.taskDown(wrkMastListAll);;
+ // 浠诲姟瀹屾垚
+ mainService.rgvCompleteWrkMastSta(autoZ);
+// //鏇存柊浣嶇疆淇℃伅
+// mainService.updateStePositionNearby(null);
+// //鏇存柊浣嶇疆淇℃伅
+// mainService.updateStePosition();
+// // 浠诲姟涓嬪彂
+// mainService.DevpTaskNoRun();
+// // 浠诲姟瀹屾垚
+// mainService.rgvCompleteWrkMastSta(autoZ);
+// //鏇存柊浣嶇疆淇℃伅
+// mainService.updateStePosition();
-
-
-
-
-
-
-
- // 闂撮殧
- Thread.sleep(1500);
- log.info("WCS 宸ヤ綔涓� .....................");
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1