From 6397754d1a97f7b570435e8ab81d3ef1d152b2d0 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 11 八月 2025 16:01:53 +0800
Subject: [PATCH] 1、义乌改造：进出笼规则调整，当存在进片任务/请求时，出片大车不执行调度任务 2、进片一个笼子存放一个工程，笼子存在工程时，按笼子使用情况，剩余格子最多的优先使用 3、指定钢化工程改造
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java
index e24376a..a5605eb 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java
@@ -102,15 +102,10 @@
.eq(BigStorageGlassRelationInfo::getTemperingLayoutId, relationInfoOne.getTemperingLayoutId())
.eq(BigStorageGlassRelationInfo::getVirtualSlot, relationInfoOne.getVirtualSlot())
.eq(BigStorageGlassRelationInfo::getSlotSequence, relationInfoOne.getSlotSequence() - 1));
- BigStorageCage storageCage = null;
+ BigStorageDTO storageCageDTO = null;
if (null == relationInfoBefore) {
//琛ㄧず搴忓彿娌℃湁鎴栬�� 搴忓彿涓�1鍙堜笉鏄涓�鍧楁潵鐨� 鏂板紑涓�鏍�
- storageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
- .eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getRemainWidth, slotWidth)
- .le(BigStorageCage::getMinThickness, bigStorageCageDetails.getThickness())
- .ge(BigStorageCage::getMaxThickness, bigStorageCageDetails.getThickness())
- .orderByAsc(BigStorageCage::getMaxThickness)
- .orderByAsc(BigStorageCage::getSlot).last("limit 1"));
+ storageCageDTO = bigStorageCageDetailsService.queryTargetSlot(engineerId, bigStorageCageDetails.getGlassId(), (int) bigStorageCageDetails.getThickness());
} else {
BigStorageCageDetails beforeGlass = bigStorageCageDetailsService.getOne(new LambdaQueryWrapper<BigStorageCageDetails>()
.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)
@@ -119,23 +114,18 @@
.eq(BigStorageCageDetails::getTemperingFeedSequence, relationInfoBefore.getTemperingFeedSequence())
);
if (null == beforeGlass) {
- storageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
- .eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getRemainWidth, slotWidth)
- .le(BigStorageCage::getMinThickness, bigStorageCageDetails.getThickness())
- .ge(BigStorageCage::getMaxThickness, bigStorageCageDetails.getThickness())
- .orderByAsc(BigStorageCage::getMaxThickness).orderByAsc(BigStorageCage::getSlot).last("limit 1"));
+ storageCageDTO = bigStorageCageDetailsService.queryTargetSlot(engineerId, bigStorageCageDetails.getGlassId(), (int) bigStorageCageDetails.getThickness());
} else {
- storageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
+ BigStorageCage bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
.eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getSlot, beforeGlass.getSlot()));
+ Assert.isTrue(null != bigStorageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
+ storageCageDTO = new BigStorageDTO();
+ storageCageDTO.setWidth(bigStorageCage.getRemainWidth());
+ storageCageDTO.setSlot(bigStorageCage.getSlot());
+ storageCageDTO.setDeviceId(bigStorageCage.getDeviceId());
}
}
- Assert.isTrue(null != storageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
- BigStorageDTO storageDTO = new BigStorageDTO();
- storageDTO.setDeviceId(storageCage.getDeviceId());
- storageDTO.setSlotSequence(relationInfoOne.getSlotSequence());
- storageDTO.setSlot(storageCage.getSlot());
- storageDTO.setWidth(storageCage.getRemainWidth());
- return storageDTO;
+ return storageCageDTO;
}
@Override
@@ -217,7 +207,7 @@
private Integer getGlassGapByThickness(Double thickness) {
int sysKey = 0;
- if (thickness >= 12 ) {
+ if (thickness >= 12) {
sysKey = ConstSysConfig.VERTICAL_GLASS_GAP_12;
} else if (thickness == 8) {
sysKey = ConstSysConfig.VERTICAL_GLASS_GAP_8;
--
Gitblit v1.8.0