From f422952b2795e360e914719a7e500775e2e9f058 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 27 五月 2025 12:31:35 +0800
Subject: [PATCH] #ZH
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 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 2b44c8e..7ab88ac 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -749,7 +749,8 @@
log.error("鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
continue;
}
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0
+// && staProtocol.isInEnable()
&& staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
flag = true;
}
@@ -1477,7 +1478,7 @@
// 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢
if (staProtocol.isAutoing()
// && staProtocol.isLoading()
- && staProtocol.isStaOk()
+// && staProtocol.isStaOk()
&& staProtocol.getWorkNo() != 0) {
TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo());
if (taskWrk != null) {
@@ -1633,7 +1634,7 @@
}
}
}
- if (!sign) {
+ if (!sign && staList.size()>1) {
// 鍗婅竟鍖哄煙鍐呭彇璐т换鍔�
for (Integer staNoNow : rangeList) {
for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
@@ -1656,26 +1657,26 @@
}
}
}
- if (!sign) {
- // 鍗婅竟鍖哄煙鍐呮斁璐т换鍔�
- for (Integer staNoNow : rangeListOther) {
- for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
- if (rgvStn.getStaNo().equals(staNoNow)) {
- TaskWrk taskWrk = deviceDetection(rgvStn);
- if (taskWrk != null) {
- BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", BarcodeUtils.getOutStaNo(taskWrk.getOriginTargetPoint())));
- if (RouteUtils.CheckIfItIsWithinTheRange(rangeList, basDevpPosition.getPlcPosition(), basDevpPositions, itSmall)) {
- sign = taskGenerate(rgvSlave, rgvStn, 0);
- }
- }
- break;
- }
- }
- if (sign) {
- break;
- }
- }
- }
+// if (!sign) {
+// // 鍗婅竟鍖哄煙鍐呮斁璐т换鍔�
+// for (Integer staNoNow : rangeListOther) {
+// for (RgvSlave.RgvStn rgvStn : rgvSlave.getRgvInSta()) {
+// if (rgvStn.getStaNo().equals(staNoNow)) {
+// TaskWrk taskWrk = deviceDetection(rgvStn);
+// if (taskWrk != null) {
+// BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", BarcodeUtils.getOutStaNo(taskWrk.getOriginTargetPoint())));
+// if (RouteUtils.CheckIfItIsWithinTheRange(rangeList, basDevpPosition.getPlcPosition(), basDevpPositions, itSmall)) {
+// sign = taskGenerate(rgvSlave, rgvStn, 0);
+// }
+// }
+// break;
+// }
+// }
+// if (sign) {
+// break;
+// }
+// }
+// }
} else {
//鍙敤鍖哄煙灏辫繎鍙栬揣
//灏辫繎鎺掑簭
--
Gitblit v1.9.1