From 514dae5edaeaa2be689203edf2e3eb45b47f97bc Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 15 十二月 2025 08:37:07 +0800
Subject: [PATCH] 1、读取卧转立空闲请求后置 2、8毫米超大尺寸的玻璃增加判断只出一片
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
index dc3aaba..18f0766 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
@@ -393,16 +393,7 @@
log.info("褰撳墠鏈敹鍒板嚭鐗囪姹傦紝缁撴潫鍑虹墖浠诲姟");
return;
}
- try {
- int outRequest = s7plcWZL.readUInt16("DB51.8");
- if (outRequest == 0){
- log.info("褰撳墠鏈敹鍒板崸杞珛鍏佽鍑虹墖璇锋眰锛岀粨鏉熷嚭鐗囦换鍔�");
- return;
- }
- } catch (Exception e) {
- log.error("璇诲彇鍗ц浆绔嬩俊鍙峰紓甯�", e);
- return;
- }
+
//鑾峰彇鍑虹墖浠诲姟琛�
List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataWLTwo);
@@ -475,6 +466,17 @@
S7DataDLPTwo s7DataDLPTwo = new S7DataDLPTwo();
s7DataDLPTwo.setMesReply(1);
s7SerializerDLPTwo.write(s7DataDLPTwo);
+ return;
+ }
+
+ try {
+ int outRequest = s7plcWZL.readUInt16("DB51.8");
+ if (outRequest == 0){
+ log.info("褰撳墠鏈敹鍒板崸杞珛鍏佽鍑虹墖璇锋眰锛岀粨鏉熷嚭鐗囦换鍔�");
+ return;
+ }
+ } catch (Exception e) {
+ log.error("璇诲彇鍗ц浆绔嬩俊鍙峰紓甯�", e);
return;
}
@@ -1031,7 +1033,11 @@
} else {
List<String> glassIdList = bigStorageGlassRelationInfoService.queryNeedOutGlassId(
list.get(0).getEngineerId(), list.get(0).getTemperingLayoutId(), list.get(0).getTemperingFeedSequence());
- outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList());
+ if (CollectionUtil.isNotEmpty(glassIdList)) {
+ outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList());
+ } else {
+ outGlassList = list.subList(0, 1);
+ }
}
// }
Assert.isFalse(CollectionUtil.isEmpty(outGlassList), "鏈幏鍙栧嚭鐗囨暟鎹紝缁撴潫鍑虹墖浠诲姟");
--
Gitblit v1.8.0