From f3e1240dc943cefae96860ea4cd4a82e4da3c41e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 23 十月 2024 08:37:48 +0800
Subject: [PATCH] 修改大理片进片程序
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 28 ++++++++++++++--------------
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml | 6 +++---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml | 3 +--
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java | 2 +-
4 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
index 49869da..b47573d 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@
spring:
profiles:
- active: cz
+ active: dev
application:
name: cacheGlass
liquibase:
@@ -15,7 +15,6 @@
mes:
threshold: 3
ratio: 10
- cache: # 鍗у紡鐞嗙墖鏈�澶у昂瀵�
cache: # 鍗у紡鐞嗙墖鏈�澶у昂瀵�
cacheWidth: 3600
cacheHeight: 3000
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
index 1f92723..903d7aa 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
@@ -168,7 +168,7 @@
}
}
-// @Scheduled(fixedDelay = Long.MAX_VALUE)
+ @Scheduled(fixedDelay = Long.MAX_VALUE)
public void scanCodeTask() {
log.info("鎵弿浠诲姟宸插惎鍔�");
while (true) {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index 8d558eb..f30b7d0 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -607,27 +607,27 @@
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
List<String> glassIds1 = new ArrayList<>();
List<String> glassIds2 = new ArrayList<>();
-// for (int i = 1; i <= 6; i++) {
-// String line1GlassId = plcParameterObject.getPlcParameter("D03ID" + i).getValue();
-// if (StringUtils.isNotEmpty(line1GlassId)) {
-// glassIds1.add(line1GlassId);
-// }
-// String line2GlassId = plcParameterObject.getPlcParameter("D05ID" + i).getValue();
-// if (StringUtils.isNotEmpty(line2GlassId)) {
-// glassIds1.add(line2GlassId);
-// }
-// }
+ for (int i = 1; i <= 6; i++) {
+ String line1GlassId = plcParameterObject.getPlcParameter("D03ID" + i).getValue();
+ if (StringUtils.isNotEmpty(line1GlassId)) {
+ glassIds1.add(line1GlassId);
+ }
+ String line2GlassId = plcParameterObject.getPlcParameter("D05ID" + i).getValue();
+ if (StringUtils.isNotEmpty(line2GlassId)) {
+ glassIds2.add(line2GlassId);
+ }
+ }
List<BigStorageCageFeedTask> bigStorageCageFeedTasks1 = bigStorageCageFeedTaskService.list(
new LambdaQueryWrapper<BigStorageCageFeedTask>()
- .eq(BigStorageCageFeedTask::getTaskState, 1)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_NEW)
.eq(BigStorageCageFeedTask::getLine, Const.A09_OUT_TARGET_POSITION)
);
List<BigStorageCageFeedTask> bigStorageCageFeedTasks2 = bigStorageCageFeedTaskService.list(
new LambdaQueryWrapper<BigStorageCageFeedTask>()
- .eq(BigStorageCageFeedTask::getTaskState, 1)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_NEW)
.eq(BigStorageCageFeedTask::getLine, Const.A10_OUT_TARGET_POSITION)
);
- if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1) && glassIds1 != null) {
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1) && CollectionUtils.isNotEmpty(glassIds1)) {
List<String> matchingIds1 = bigStorageCageFeedTasks1.stream()
.map(BigStorageCageFeedTask::getGlassId)
.filter(glassIds1::contains)
@@ -640,7 +640,7 @@
.set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
);
}
- if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks2) && glassIds2 != null) {
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks2) && CollectionUtils.isNotEmpty(glassIds2)) {
List<String> matchingIds2 = bigStorageCageFeedTasks2.stream()
.map(BigStorageCageFeedTask::getGlassId)
.filter(glassIds2::contains)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index cacf77c..b10f0a1 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@
spring:
profiles:
- active: cz
+ active: dev
application:
name: cacheVerticalGlass
liquibase:
@@ -23,8 +23,8 @@
minCount: 20
carWidth: 5000 #澶ц溅瀹藉害
slotWidth: 5000 #澶ц溅瀹藉害
- inCarMaxSize: 0 #杩涚墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
- outCarMaxSize: 2 #鍑虹墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
+ inCarMaxSize: 2 #杩涚墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
+ outCarMaxSize: 3 #鍑虹墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
glassGap: 350 #鐜荤拑闂磋窛
xMaxSize: 2800
scan:
--
Gitblit v1.8.0