From 26a385feec1f358a8b6ccb23290f8f7046303203 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 16 十二月 2024 16:54:42 +0800
Subject: [PATCH] 1、大理片笼详情表新增膜系字段 2、钢化查询接口改造:0非钢查询  1 钢化查询 3、指定钢化界面新增接口缺少详情接口:点击可查看当前工程+流程下缺失的玻璃信息 ,isdamage是否破损,当为1的时候无破损按钮 ,0时可以有破损按钮

---
 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