From 60f572b6b7c516db6ccda32c768f9117b4e51167 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 17 四月 2025 16:49:58 +0800
Subject: [PATCH] 1、fixbug:中空出片优先lisec问题解决 2、卧式理片笼出片路径调整，优先小线 3、fixbug:卧式理片笼两条线同时跑发生大线往小线送玻璃的情况 4、磨边后新增玻璃交互，为plc获取不到玻璃尺寸做二道保障
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
index cee94a9..ee90fdb 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
@@ -105,10 +105,10 @@
//鑾峰彇绗簩鏉＄嚎璺殑鍗у紡鐞嗙墖绗肩姸鎬�
ReadWriteEntity twoInkageEntity = miloService.readFromOpcUa("WL2.WL2.deviceState");
//榛樿鍙窇涓�鍙板崸寮忕悊鐗�,涓ゆ潯绾胯矾閮藉彲浠ヨ蛋
- int cellFlag = 2;
+ int cellFlag = 1;
//濡傛灉涓ゆ潯绾块兘鍚姩鍒欏彧鑳借窇涓�鏉＄嚎
- if (twoInkageEntity != null && Boolean.parseBoolean(twoInkageEntity.getValue() + "")) {
- cellFlag = 1;
+ if (twoInkageEntity != null && !Boolean.parseBoolean(twoInkageEntity.getValue() + "")) {
+ cellFlag = 2;
}
startOneOpcTaskChild(EDG_STORAGE_DEVICE_ONE_TASK, 1, cellFlag);
}
@@ -116,9 +116,9 @@
@Scheduled(fixedDelay = 1000)
public void startTwoOpcTask() throws Exception {
ReadWriteEntity oneInkageEntity = miloService.readFromOpcUa("WL1.WL1.deviceState");
- int cellFlag = 2;
- if (oneInkageEntity != null && Boolean.parseBoolean(oneInkageEntity.getValue() + "")) {
- cellFlag = 1;
+ int cellFlag = 1;
+ if (oneInkageEntity != null && !Boolean.parseBoolean(oneInkageEntity.getValue() + "")) {
+ cellFlag = 2;
}
startOneOpcTaskChild(EDG_STORAGE_DEVICE_TWO_TASK, 2, cellFlag);
}
@@ -299,7 +299,7 @@
twoOutState = twoOutStateEntity.getValue().toString();
}
- if ((Const.OUT_BUSY.equals(oneOutState) && Const.OUT_BUSY.equals(twoOutState)) || (Const.OUT_DISABLE.equals(oneOutState) && Const.OUT_DISABLE.equals(twoOutState))) {
+ if ((cellFlag == 2 && Const.OUT_BUSY.equals(oneOutState) && Const.OUT_BUSY.equals(twoOutState)) || (Const.OUT_DISABLE.equals(oneOutState) && Const.OUT_DISABLE.equals(twoOutState))) {
log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", oneOutState, oneOutState);
return Boolean.FALSE;
}
@@ -310,17 +310,21 @@
if (cellFlag == 1) {
cell = deviceId;
} else {
- if (Const.OUT_FREE.equals(oneOutState)) {
- cell = Const.ONE_OUT_TARGET_POSITION;
- } else if (Const.OUT_FREE.equals(twoOutState)) {
+ if (Const.OUT_FREE.equals(twoOutState)) {
cell = Const.TWO_OUT_TARGET_POSITION;
+ } else if (Const.OUT_FREE.equals(oneOutState)) {
+ cell = Const.ONE_OUT_TARGET_POSITION;
} else {
return Boolean.FALSE;
}
}
if (Const.OUT_FREE.equals(oneOutState) && Const.OUT_FREE.equals(twoOutState)) {
- if (!outChildTask(task, tableName, deviceId, cell, startDate)) {
- cell = cell == Const.ONE_OUT_TARGET_POSITION ? Const.TWO_OUT_TARGET_POSITION : Const.ONE_OUT_TARGET_POSITION;
+ if (cellFlag == 2) {
+ if (!outChildTask(task, tableName, deviceId, cell, startDate)) {
+ cell = cell == Const.ONE_OUT_TARGET_POSITION ? Const.TWO_OUT_TARGET_POSITION : Const.ONE_OUT_TARGET_POSITION;
+ return outChildTask(task, tableName, deviceId, cell, startDate);
+ }
+ } else {
return outChildTask(task, tableName, deviceId, cell, startDate);
}
} else {
--
Gitblit v1.8.0