From 0aef9abcba7f6e2cd41e330f397760cb8147c9b7 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 18 七月 2024 08:38:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index 5b09ac0..96d4e3b 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -96,13 +96,14 @@
.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
.isNull(BigStorageCageFeedTask::getTargetSlot);
List<BigStorageCageFeedTask> bigStorageCageFeedTaskNoTargetList = bigStorageCageFeedTaskMapper.selectList(feedTaskNoTargetWrapper);
- for (BigStorageCageFeedTask bigStorageCageFeedTask:bigStorageCageFeedTaskNoTargetList
- ) {
- BigStorageCageDetails bigStorageCageDetails=new BigStorageCageDetails();
+ for (BigStorageCageFeedTask bigStorageCageFeedTask : bigStorageCageFeedTaskNoTargetList
+ ) {
+ BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>();
- glassInfoWrapper.eq(GlassInfo::getGlassId,bigStorageCageFeedTask.getGlassId());
- GlassInfo glassInfo= glassInfoMapper.selectOne(glassInfoWrapper);
+ glassInfoWrapper.eq(GlassInfo::getGlassId, bigStorageCageFeedTask.getGlassId());
+ GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper);
BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
+ bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
bigStorageCageDetailsList.add(bigStorageCageDetails);
}
return bigStorageCageDetailsList;
@@ -285,9 +286,12 @@
bigStorageDTO.setSlot(bigStorageCage.getSlot());
return bigStorageDTO;
}
+ //todo:鑾峰彇鐜荤拑鐨勫帤搴︼細閲嶆柊閫夌瀛愰渶瑕佹寜鐓х瀛愬彲鏀剧幓鐠冨帤搴﹁繘琛岄�夋嫨
bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
.eq(BigStorageCage::getRemainWidth, slotWidth)
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
+ .gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
+ .orderByAsc(BigStorageCage::getDeviceId)
.last("limit 1"));
Assert.isTrue(null != bigStorageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
bigStorageDTO = new BigStorageDTO();
@@ -297,7 +301,7 @@
}
@Override
- public TemperingLayoutDTO temperingIsAll() {
+ public List<TemperingLayoutDTO> temperingIsAll() {
return baseMapper.temperingIsAll();
}
--
Gitblit v1.8.0