From f9978d9309b3a75f078b32746bcb96d4afd55bcc Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 19 十月 2025 23:50:51 +0800
Subject: [PATCH] 1、 切割/钢化版图展示，仅将破损未报工的小片显示为破损
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 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..0de55af 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
@@ -187,14 +177,10 @@
@Override
public int bigStorageSlotPair(BigStorageGlassInfo bigStorageGlassInfo) {
//鑾峰彇鎵�鏈夌┖闂插彲鐢ㄧ殑鏍煎瓙鍙�
- Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_SLOT_WIDTH);
- BigStorageCage storageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
- .eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getRemainWidth, slotWidth)
- .le(BigStorageCage::getMinThickness, bigStorageGlassInfo.getThickness())
- .ge(BigStorageCage::getMaxThickness, bigStorageGlassInfo.getThickness())
- .orderByAsc(BigStorageCage::getMaxThickness).orderByAsc(BigStorageCage::getSlot).last("limit 1"));
- Assert.isTrue(null != storageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
- Integer slot = storageCage.getSlot();
+ BigStorageDTO bigStorageDTO = bigStorageCageDetailsService.queryTargetSlot(bigStorageGlassInfo.getEngineerId(),
+ bigStorageGlassInfo.getGlassId(), bigStorageGlassInfo.getThickness().intValue());
+ Assert.isTrue(null != bigStorageDTO, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
+ Integer slot = bigStorageDTO.getSlot();
//鑾峰彇璇ュ伐绋嬪悓涓�娴佺▼鍗″悓涓�杞︾殑鐜荤拑淇℃伅
List<BigStorageGlassInfo> bigStorageGlassInfoList = this.list(new LambdaQueryWrapper<BigStorageGlassInfo>()
.eq(BigStorageGlassInfo::getEngineerId, bigStorageGlassInfo.getEngineerId())
@@ -205,7 +191,7 @@
BigStorageGlassRelationInfo info = new BigStorageGlassRelationInfo();
BeanUtils.copyProperties(e, info);
info.setSlot(slot);
- info.setDeviceId(storageCage.getDeviceId());
+ info.setDeviceId(bigStorageDTO.getDeviceId());
return info;
}).collect(Collectors.toList());
//淇濆瓨鍏崇郴琛�
@@ -217,7 +203,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