From 0add19748b6c8ac642048b45821833bc32a2444b Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 29 七月 2024 08:41:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 9d84131..8de5698 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
@@ -353,15 +353,15 @@
public boolean TemperingGlass(String temperingLayoutId, String engineerId) {
LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
temperingGlassInfoLambdaQueryWrapper
- .eq(TemperingGlassInfo::getTemperingLayoutId, temperingLayoutId)
- .eq(TemperingGlassInfo::getEngineerId, engineerId);
- List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper);
- if (temperingGlassInfoList.size() == 0) {
- LambdaQueryWrapper<BigStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(BigStorageCageDetails::getTemperingLayoutId, temperingLayoutId)
- .eq(BigStorageCageDetails::getEngineerId, engineerId)
- .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL);
- List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(wrapper);
+ .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)
+ .eq(BigStorageCageDetails::getEngineerId,engineerId)
+ .in(BigStorageCageDetails::getState,Const.GLASS_STATE_IN,Const.GLASS_STATE_ARTIFICIAL);
+ List<BigStorageCageDetails> bigStorageCageDetailsList=baseMapper.selectList(wrapper);
for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
) {
@@ -385,9 +385,10 @@
}
@Override
- public List<Map<String, Object>> selectTemperingGlass() {
+ 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;
--
Gitblit v1.8.0