From 448e5b139e803002547552b989e32c0392d59e4b Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 12 七月 2022 16:05:42 +0800
Subject: [PATCH] Merge branch 'hylywcs' of http://47.97.1.152:5880/r/zy-wcs into hylywcs
---
src/main/java/com/zy/core/MainProcess.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index fb1f99a..a7a89ca 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.PreDestroy;
+import java.util.ArrayList;
/**
* WCS涓绘祦绋�
@@ -23,8 +24,6 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
- @Value("${crnBackHp.enable}")
- private boolean crnBackHp;
/**
* =====>> 寮�濮嬪伐浣�
@@ -62,16 +61,13 @@
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-// mainService.storeEmptyPlt();
+ mainService.storeEmptyPlt();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
- if (crnBackHp) {
- //鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃澶囧瓨鍦ㄥ叆搴撲换鍔℃椂鍙洖鍘熺偣
- mainService.crnRebackHp();
- }
+ mainService.outOfDevp();
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1