From d345b4106c4463226b3b1e840a4c391fc2ceb498 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 25 三月 2025 12:55:19 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/MainProcess.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index fb1f99a..668ed7c 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -9,6 +9,8 @@
import org.springframework.stereotype.Component;
import javax.annotation.PreDestroy;
+import java.util.ArrayList;
+import java.util.Calendar;
/**
* WCS涓绘祦绋�
@@ -23,8 +25,8 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
- @Value("${crnBackHp.enable}")
- private boolean crnBackHp;
+ // 棰戠巼
+ private int i = 0;
/**
* =====>> 寮�濮嬪伐浣�
@@ -36,6 +38,14 @@
// 闂撮殧
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()) {
@@ -62,15 +72,19 @@
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-// mainService.storeEmptyPlt();
+ mainService.storeEmptyPlt();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
- if (crnBackHp) {
- //鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃澶囧瓨鍦ㄥ叆搴撲换鍔℃椂鍙洖鍘熺偣
- mainService.crnRebackHp();
+ mainService.outOfDevp();
+
+ // 鍏朵粬 ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
+ i++;
+ if (i > 1) {
+ mainService.ioConvert();
+ i = 0;
}
} catch (Exception e) {
--
Gitblit v1.9.1