From 3142e113506dc1f7ae8df3fcd90b57057f5767ac Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 31 七月 2024 09:25:37 +0800
Subject: [PATCH] 大理片笼出片任务调整：1、出片任务一次生成多片fixbug
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 94d89f3..9643786 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
@@ -714,12 +714,11 @@
int maxX = 0;
for (T e : list) {
int maxLength = Math.max((int) e.getWidth(), (int) e.getHeight());
- if (bigStorageCageOutTaskList.size() >= outCarMaxSize || maxLength > remainWidth) {
+ if (serialNumber > outCarMaxSize || maxLength > remainWidth) {
remainWidth = carWidth;
trainNumber = trainNumber + 1;
serialNumber = 1;
maxX = 0;
- continue;
}
remainWidth = remainWidth - maxLength - glassGap;
if (isTempering) {
@@ -729,11 +728,13 @@
e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1));
maxX = Math.max(maxX, e.getXCoordinate());
} else {
- remainWidth = carWidth;
+ remainWidth = carWidth - maxLength - glassGap;
+ ;
trainNumber = trainNumber + 1;
serialNumber = 1;
- maxX = 0;
- continue;
+ maxX = e.getXCoordinate();
+ bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
+ e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1));
}
} else {
bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
--
Gitblit v1.8.0