From fe783a3ae2295dba85fd9775b610eb13e4e41f00 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期二, 24 六月 2025 22:36:37 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 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 5881a59..c22aa53 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -979,8 +979,11 @@
}
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
- if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
- && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
+ 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()) {
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
// 鍫嗗灈鏈烘帶鍒惰繃婊�
@@ -1082,6 +1085,8 @@
if (staProtocol.isOutEnable()){
CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "娌℃湁鍙嚭");
}
+ } else {
+ CrnErrCache.updateCrnErr(crnProtocol.getCrnNo(), "鍑哄簱绔欑偣锛氶潪鑷姩");
}
}
}
@@ -1568,9 +1573,15 @@
}
if (rgvProtocolOther.statusEnable) {
BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", staNo));
- if (Math.abs(basDevpPosition.getPlcPosition()-rgvProtocol.getRgvPos())
+ long abs = Math.abs(Math.abs(basDevpPosition.getPlcPosition() - rgvProtocol.getRgvPos())
+ -
+ Math.abs(basDevpPosition.getPlcPosition() - rgvProtocolOther.getRgvPos()));
+ if (abs<100){
+ return true;
+ }
+ if (Math.abs(basDevpPosition.getPlcPosition() - rgvProtocol.getRgvPos())
>=
- Math.abs(basDevpPosition.getPlcPosition()-rgvProtocolOther.getRgvPos())){
+ Math.abs(basDevpPosition.getPlcPosition() - rgvProtocolOther.getRgvPos())){
return false;
}
}
@@ -1594,6 +1605,12 @@
}
if (rgvProtocolOther.statusEnable) {
BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("DEV_NO", staNo));
+ long abs = Math.abs(Math.abs(basDevpPosition.getPlcPosition() - rgvProtocol.getRgvPos())
+ -
+ Math.abs(basDevpPosition.getPlcPosition() - rgvProtocolOther.getRgvPos()));
+ if (abs<100){
+ return true;
+ }
if (Math.abs(basDevpPosition.getPlcPosition()-rgvProtocol.getRgvPos())
>=
Math.abs(basDevpPosition.getPlcPosition()-rgvProtocolOther.getRgvPos())){
@@ -1618,7 +1635,6 @@
TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo());
if (taskWrk != null) {
Integer stano = staProtocol.getStaNo();
-
if (staProtocol.getSiteId() == 1004 || staProtocol.getSiteId()==1020){
// 灏哄妫�娴嬪紓甯�
@@ -1682,6 +1698,21 @@
}
}
return taskWrk;
+ }
+ } else if (staProtocol.isAutoing() && staProtocol.getWorkNo() == 0 && !staProtocol.isLoading()){
+ if (inSta.isDirectionOther()){
+ StaProtocol staProtocolOther = devpThread.getStation().get(inSta.getStaNoOther());
+ if (staProtocolOther == null) {
+ return null;
+ }
+ // 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢
+ if (staProtocolOther.isAutoing()
+ && staProtocolOther.getWorkNo() != 0) {
+ TaskWrk taskWrkOther = taskWrkService.selectByWrkNo(staProtocolOther.getWorkNo());
+ if (taskWrkOther != null) {
+ return taskWrkOther;
+ }
+ }
}
}
return null;
@@ -1828,7 +1859,6 @@
if (rgvOtherIDLEOther2(rgvSlave)){
if (!rgvOtherIDLE2(rgvSlave,staList.get(0))){
System.out.println("杩愯灏辫繎璺宠繃==="+rgvSlave.getId()+"===");
-
sign=true;
}
}
--
Gitblit v1.9.1