From 3e1aa4864da243ade9f8ee6e3a6fc43e1cf5d8b2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 07 七月 2025 16:59:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 9 +++-
src/main/java/com/zy/core/MainProcess.java | 56 ++++++++++++++--------------
2 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 7d2b90f..73e31c8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1097,11 +1097,11 @@
}
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
- if (staProtocol.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {
+// if (staProtocol.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {
// // 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
-// if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
-// && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
+ if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
+ && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
// 鍫嗗灈鏈烘帶鍒惰繃婊�
@@ -1203,6 +1203,9 @@
if (staProtocol.isOutEnable()){
CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "娌℃湁鍙嚭");
}
+ if (staProtocol.isLoading()){
+ CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鍑哄簱绔欐湁鐗�");
+ }
} else {
CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鍑哄簱绔欑偣锛氶潪鑷姩");
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 23f31d7..91a1d16 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -22,7 +22,7 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
- private Thread thread2;
+// private Thread thread2;
/**
* =====>> 寮�濮嬪伐浣�
@@ -40,11 +40,15 @@
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(); // 缁勬墭
// mainService.generateStoreWrkFileIsEmptyMk(); // 缁勬墭 绌烘墭
- mainService.generateStoreWrkFileWalk(); // 浠诲姟涓嬪彂
+ mainService.generateStoreWrkFileWalk(); // wms鍏ュ簱浠诲姟涓嬪彂
+ // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
+ mainService.crnStnToOutStn();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
mainService.crnIoExecute();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
+ // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
+ mainService.recCrnErr();
// 浠诲姟涓嬪彂
mainService.taskStart();
// 鍑哄簱 ===>> 鍫嗗灈鏈�10鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣
@@ -56,37 +60,33 @@
});
thread.start();
- thread2 = new Thread(() -> {
- while (!Thread.currentThread().isInterrupted()) {
- try {
- // 闂撮殧
- Thread.sleep(200);
- // 绯荤粺杩愯鐘舵�佸垽鏂�
- if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
- continue;
- }
- // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
- mainService.crnStnToOutStn();
- // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
- mainService.recCrnErr();
- // 杈撻�佺嚎寮傚父淇℃伅璁板綍
-// mainService.recDevErr();
- // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
-// mainService.ledExecute(9);
- // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
-// mainService.ledReset(10);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- });
- thread2.start();
+// thread2 = new Thread(() -> {
+// while (!Thread.currentThread().isInterrupted()) {
+// try {
+// // 闂撮殧
+// Thread.sleep(200);
+// // 绯荤粺杩愯鐘舵�佸垽鏂�
+// if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+// continue;
+// }
+// // 杈撻�佺嚎寮傚父淇℃伅璁板綍
+//// mainService.recDevErr();
+// // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
+//// mainService.ledExecute(9);
+// // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+//// mainService.ledReset(10);
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+// });
+// thread2.start();
}
@PreDestroy
public void shutDown(){
if (thread != null) thread.interrupt();
- if (thread2 != null) thread2.interrupt();
+// if (thread2 != null) thread2.interrupt();
}
}
--
Gitblit v1.9.1