From ea8859c58b8fd24a54f7a838d6f8eaa98d57fb65 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 18 十二月 2024 11:44:07 +0800
Subject: [PATCH] 1、大理片笼进出片任务新增限制：进片玻璃数大于可用格子时，不允许进片 2、超过最大尺寸且直通通道有玻璃时 不能进片 3、大理片超过最大高度走直通通道 4、fixbug:笼子厚度限制
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
index 498c557..39f344b 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
@@ -92,6 +92,7 @@
if (null == hollowDetails) {
storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
.eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth)
+ .le(HollowBigStorageCage::getMinThickness, relationInfoOne.getThickness())
.ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness())
.orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));
HollowBigStorageDTO storageDTO = new HollowBigStorageDTO();
@@ -108,7 +109,9 @@
//琛ㄧず搴忓彿娌℃湁鎴栬�� 搴忓彿涓�1鍙堜笉鏄涓�鍧楁潵鐨� 鏂板紑涓�鏍�
storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
.eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth)
- .ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness()).orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));
+ .le(HollowBigStorageCage::getMinThickness, relationInfoOne.getThickness())
+ .ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness())
+ .orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));
} else {
HollowBigStorageCageDetails beforeGlass = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)
@@ -119,6 +122,7 @@
if (null == beforeGlass) {
storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
.eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth)
+ .le(HollowBigStorageCage::getMinThickness, relationInfoOne.getThickness())
.ge(HollowBigStorageCage::getMaxThickness, relationInfoOne.getThickness())
.orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));
} else {
--
Gitblit v1.8.0