From 13b9ac920cebb843717bfd18369c5179fe056c91 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 16 六月 2025 16:38:42 +0800
Subject: [PATCH] 1、卧式理片笼出片策略优化：均忙碌优先小线
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 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 947ba9f..9d87042 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
@@ -391,25 +391,25 @@
S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
S7DataWLExtra s7DataWLExtraTwo = s7SerializerWLTwo.read(S7DataWLExtra.class);
- Integer oneOutStateEntity = s7DataWLOne.getSlotState();
- Integer twoOutStateEntity = s7DataWLTwo.getSlotState();
- Integer d06OutStateEntity = s7DataWLExtraTwo.getD06SlotState();
+ Integer oneOutState = s7DataWLOne.getSlotState();
+ Integer twoOutState = s7DataWLTwo.getSlotState();
+ Integer d06OutState = s7DataWLExtraTwo.getD06SlotState();
//鐘舵�佹湁3涓儏鍐碉細0绌洪棽 1蹇欑 2绂佺敤
- String oneOutState = Const.OUT_DISABLE;
- String twoOutState = Const.OUT_DISABLE;
- String d06OutState = Const.OUT_DISABLE;
+// int oneOutState = Const.OUT_DISABLE;
+// int twoOutState = Const.OUT_DISABLE;
+// int d06OutState = Const.OUT_DISABLE;
// if (null != oneOutStateEntity && null != oneOutStateEntity.getValue()) {
// oneOutState = oneOutStateEntity.getValue().toString();
// }
- if (null != oneOutStateEntity) {
- oneOutState = oneOutStateEntity.toString();
- }
+// if (null != oneOutStateEntity) {
+// oneOutState = oneOutStateEntity.toString();
+// }
// if (null != twoOutStateEntity && null != twoOutStateEntity.getValue()) {
// twoOutState = twoOutStateEntity.getValue().toString();
// }
- if (null != twoOutStateEntity) {
- twoOutState = twoOutStateEntity.toString();
- }
+// if (null != twoOutStateEntity) {
+// twoOutState = twoOutStateEntity.toString();
+// }
//涓ゆ潯绾块兘涓虹鐢ㄥ垯涓嶅嚭鐜荤拑
if (Const.OUT_DISABLE.equals(oneOutState) && Const.OUT_DISABLE.equals(twoOutState)) {
log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", oneOutState, oneOutState);
@@ -418,23 +418,26 @@
// if (null != d06OutStateEntity && null != d06OutStateEntity.getValue()) {
// d06OutState = d06OutStateEntity.getValue().toString();
// }
- if (null != d06OutStateEntity) {
- d06OutState = d06OutStateEntity.toString();
- }
+// if (null != d06OutStateEntity) {
+// d06OutState = d06OutStateEntity.toString();
+// }
//鑾峰彇d06鐗囧彴鐘舵��
// 1:涓�瀵逛竴鐨勬儏鍐典笅涓嶉渶瑕佸垽鏂璬06鐘舵��
// 2:涓�鍙风嚎涓�瀵瑰鐨勬儏鍐典笅锛岃幏鍙栦簩鍙风嚎纾ㄨ竟鍓嶇墖鍙癉07鐨勭姸鎬侊紝D07闈炵鐢ㄦ椂锛屼簩鍙风嚎灏嗘寜鐓06鐗囧彴鐘舵�佽寰楀嚭鐗�
// 3:浜屽彿绾夸竴瀵瑰鐨勬儏鍐典笅锛岃幏鍙栦竴鍙风嚎纾ㄨ竟鍓嶇墖鍙癈08鐨勭姸鎬侊紝C08闈炵鐢ㄦ椂锛屼竴鍙风嚎灏嗘寜鐓06鐗囧彴鐘舵�佽寰楀嚭鐗�
if (cellFlag == 2) {
if (deviceId == 1) {
- twoOutState = Const.OUT_DISABLE.equals(twoOutState) ? Const.OUT_DISABLE : d06OutState;
+
+// twoOutState = Const.OUT_DISABLE.equals(twoOutState) ? Const.OUT_DISABLE : d06OutState;
+ twoOutState = twoOutState & d06OutState;
} else {
- oneOutState = Const.OUT_DISABLE.equals(oneOutState) ? Const.OUT_DISABLE : d06OutState;
+ oneOutState = oneOutState & d06OutState;
+// oneOutState = Const.OUT_DISABLE.equals(oneOutState) ? Const.OUT_DISABLE : d06OutState;
}
- if (Const.OUT_BUSY.equals(oneOutState) && Const.OUT_BUSY.equals(twoOutState)) {
- log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", oneOutState, oneOutState);
- return Boolean.FALSE;
- }
+// if (Const.OUT_BUSY.equals(oneOutState) && Const.OUT_BUSY.equals(twoOutState)) {
+// log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", oneOutState, oneOutState);
+// return Boolean.FALSE;
+// }
}
log.info("寮�濮嬫墽琛屽嚭鐗�/鐩撮�氫换鍔★紝浠诲姟淇℃伅涓猴細{},琛ㄥ悕涓猴細{},璁惧id:{},寮�濮嬫椂闂达細{},涓�鍙风嚎鐘舵�侊細{}锛屼簩鍙风嚎鐘舵�侊細{}",
@@ -449,7 +452,7 @@
} else if (Const.OUT_FREE.equals(oneOutState)) {
cell = Const.ONE_OUT_TARGET_POSITION;
} else {
- return Boolean.FALSE;
+ cell = Const.TWO_OUT_TARGET_POSITION;
}
}
if (Const.OUT_FREE.equals(oneOutState) && Const.OUT_FREE.equals(twoOutState)) {
--
Gitblit v1.8.0