From b3fd4ee6e9d4ae51cde28be8ae705e19af5ef9e4 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 26 七月 2024 09:50:08 +0800
Subject: [PATCH] 大理片笼:进出笼状态修改按照玻璃id和笼内格子位置
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 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 b3fb398..d944ad0 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
@@ -15,6 +15,7 @@
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
+import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper;
import com.mes.common.config.Const;
@@ -292,6 +293,7 @@
bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
.eq(BigStorageCage::getRemainWidth, slotWidth)
+ .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
.inSql(BigStorageCage::getDeviceId,
"select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
.last("limit 1"));
@@ -307,9 +309,10 @@
bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
.eq(BigStorageCage::getRemainWidth, slotWidth)
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
+ .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
.notInSql(BigStorageCage::getDeviceId,
"select distinct device_id from big_storage_cage_details where state in (100,102,103)")
- .gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
+ .ge(BigStorageCage::getMaxThickness, glassInfo.getThickness())
.orderByAsc(BigStorageCage::getDeviceId)
.last("limit 1"));
if (null != bigStorageCage) {
@@ -321,8 +324,9 @@
}
bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
.eq(BigStorageCage::getRemainWidth, slotWidth)
+ .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
- .gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
+ .ge(BigStorageCage::getMaxThickness, glassInfo.getThickness())
.orderByAsc(BigStorageCage::getDeviceId)
.last("limit 1"));
Assert.isTrue(null != bigStorageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
@@ -353,9 +357,9 @@
public boolean TemperingGlass(String temperingLayoutId, String engineerId) {
LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
temperingGlassInfoLambdaQueryWrapper
- .eq(TemperingGlassInfo::getTemperingLayoutId, temperingLayoutId)
- .eq(TemperingGlassInfo::getEngineerId, engineerId);
+ .eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW);
List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper);
+
if (temperingGlassInfoList.size() == 0) {
LambdaQueryWrapper<BigStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(BigStorageCageDetails::getTemperingLayoutId, temperingLayoutId)
@@ -380,16 +384,20 @@
} else {
return false;
}
-
-
}
@Override
public List<Map<String, Object>> selectTemperingGlass() {
QueryWrapper<BigStorageCageDetails> wrapper = new QueryWrapper<>();
wrapper.select("engineer_id,tempering_layout_id,count(*) as count")
+ .in("state", Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL)
.groupBy("engineer_id,tempering_layout_id");
List<Map<String, Object>> TemperingGlass = baseMapper.selectMaps(wrapper);
return TemperingGlass;
}
+
+ @Override
+ public void updateBySlot(List<UpdateBigStorageCageDTO> glassList, int state) {
+ baseMapper.updateBySlot(glassList, state);
+ }
}
--
Gitblit v1.8.0