From 78e2992923a14b63d76c6c7f504cb20552c6acfe Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 01 七月 2024 16:51:12 +0800
Subject: [PATCH] 大理片笼：获取格子新增格子状态，大理片分别设置进片车最大进片数量、出片车最大玻璃数量 统一格子是否启用状态 移除无用代码
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
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 23c8a17..b7f0f13 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
@@ -72,8 +72,11 @@
@Value("${mes.slotWidth}")
private Integer slotWidth;
- @Value("${mes.carMaxSize}")
- private Integer carMaxSize;
+ @Value("${mes.inCarMaxSize}")
+ private Integer inCarMaxSize;
+
+ @Value("${mes.outCarMaxSize}")
+ private Integer outCarMaxSize;
@Value("${mes.galssGap}")
private Integer galssGap;
@@ -309,7 +312,7 @@
Integer widthSecond = edgGlassTaskInfoList.get(1).getWidth();
if (remainWidth >= widthFirst) {
if (remainWidth - widthFirst - galssGap >= widthSecond) {
- if (glassCount <= carMaxSize - 1) {
+ if (glassCount <= inCarMaxSize - 1) {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
} else {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
@@ -433,7 +436,7 @@
//鎵撹溅鍓╀綑灏哄
Integer remainWidth = carWidth;
for (T e : list) {
- if (bigStorageCageOutTaskList.size() > carMaxSize || e.getWidth() > remainWidth) {
+ if (bigStorageCageOutTaskList.size() > outCarMaxSize || e.getWidth() > remainWidth) {
break;
}
remainWidth = remainWidth - (int) e.getWidth() - galssGap;
--
Gitblit v1.8.0