From 8e1267325e9ac43e80b6febee086a8f66bb5417f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 25 三月 2025 12:57:59 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/MainProcess.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 9583e04..668ed7c 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/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.util.ArrayList;
+import java.util.Calendar;
/**
* WCS涓绘祦绋�
@@ -22,6 +25,8 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
+ // 棰戠巼
+ private int i = 0;
/**
* =====>> 寮�濮嬪伐浣�
@@ -34,11 +39,23 @@
// 闂撮殧
Thread.sleep(1000);
+ Calendar calendar = Calendar.getInstance();
+ int year = calendar.get(Calendar.YEAR);
+ int month = calendar.get(Calendar.MONTH) + 1;
+ int day = calendar.get(Calendar.DAY_OF_MONTH);
+ if (year >= 2024 && month >=6 && day >= 1){
+ continue;
+ }
+
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
+ // 婕旂ず
+ mainService.crnDemoOfLocMove1();
+ // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
+// mainService.ioConvert();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(); // 缁勬墭
mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
@@ -48,6 +65,8 @@
mainService.crnStnToOutStn();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
mainService.crnIoExecute();
+ // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
+// mainService.crnIoWrkMast();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
@@ -59,6 +78,15 @@
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
+ mainService.outOfDevp();
+
+ // 鍏朵粬 ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
+ i++;
+ if (i > 1) {
+ mainService.ioConvert();
+ i = 0;
+ }
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1