From b94ae4d8f439b78a419da97d12e863d41ac4c181 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 10 十二月 2024 18:57:43 +0800
Subject: [PATCH] 1、fixbug:玻璃出片调度未将格子置空导致有进片任务,占用同一格的情况 2、大理片笼界面显示缺少任务信息 3、优化钢化推送任务

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 8cbbd60..81f5276 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
@@ -1027,7 +1027,7 @@
                 if (maxX + minLength <= xMaxSize) {
                     bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
                             e.getWidth() * 10, e.getHeight() * 10, 0, 0, 1, new Date()));
-                    maxX = Math.max(maxX, e.getXCoordinate());
+//                    maxX = Math.max(maxX, e.getXCoordinate());
                 } else {
                     break;
                 }
@@ -1086,12 +1086,12 @@
                 if (maxX + minLength <= xMaxSize) {
                     bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
                             e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1, new Date()));
-                    maxX = Math.max(maxX, e.getXCoordinate());
+//                    maxX = Math.max(maxX, e.getXCoordinate());
                 } else {
                     remainWidth = carWidth - maxLength - glassGap;
                     trainNumber = trainNumber + 1;
                     serialNumber = 1;
-                    maxX = e.getXCoordinate();
+//                    maxX = e.getXCoordinate();
                     bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
                             e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1, new Date()));
                 }

--
Gitblit v1.8.0