From a745fd53a1c8840a886c826c6a6bf0b8b226cd25 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 20 六月 2024 22:07:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
index e580072..3643a74 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -5,7 +5,9 @@
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.mes.device.PlcParameterObject;
+//import com.mes.device.PlcParameterObject;
+import com.google.common.base.Functions;
+import com.mes.common.config.Const;
import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downstorage.entity.DownStorageCage;
@@ -19,6 +21,7 @@
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.pp.entity.OptimizeDetail;
import lombok.extern.slf4j.Slf4j;
+import net.sf.jsqlparser.statement.select.SelectItem;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -85,10 +88,33 @@
.select(DownStorageCageDetails::getWidth, DownStorageCageDetails::getHeight, DownStorageCageDetails::getGlassId)
.leftJoin(DownStorageCageDetails.class, on -> on
.eq(DownStorageCageDetails::getDeviceId, DownStorageCage::getDeviceId)
- .eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot))
+ .eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot)
+ .eq(DownStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ )
.isNull(DownStorageCageDetails::getSlot)
);
}
+
+ @Override
+ public List<DownStorageCageDetails> selectCacheMax() {
+ return baseMapper.selectJoinList(DownStorageCageDetails.class,
+ JoinWrappers.lambda(DownStorageCage.class)
+ // 娣诲姞 DownStorageCage 鐨� enableState 涓� 1 鐨勬潯浠�
+ .select(DownStorageCageDetails::getFlowCardId)
+ .leftJoin(DownStorageCageDetails.class, on -> on
+ .eq(DownStorageCageDetails::getDeviceId, DownStorageCage::getDeviceId)
+ .eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot)
+ .eq(DownStorageCageDetails::getState, Const.GLASS_STATE_IN))
+ .isNull(DownStorageCageDetails::getSlot)
+ .eq(DownStorageCage::getEnableState, 1)
+ .groupBy(DownStorageCageDetails::getFlowCardId) // 鏍规嵁 flowCardId 鍒嗙粍
+ // 浣跨敤瀛愭煡璇㈠拰鎺掑簭鏉ヨ幏鍙栫浉鍚� FlowCardId 涓殑鏈�澶氳褰�
+ .having("count(*) = (select max(cnt) from (select count(*) as cnt from down_storage_cage_details group by flow_card_id) as temp)")
+
+ );
+ }
+
+
@@ -103,7 +129,8 @@
.select(DownStorageCageDetails::getGlassId, DownStorageCageDetails::getWidth, DownStorageCageDetails::getHeight, DownStorageCageDetails::getId)
.leftJoin(DownStorageCageDetails.class, on -> on
.eq(DownStorageCageDetails::getDeviceId, DownStorageCage::getDeviceId)
- .eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot))
+ .eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot)
+ .eq(DownStorageCageDetails::getState, Const.GLASS_STATE_IN))
);
}
--
Gitblit v1.8.0