From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:15:53 +0800
Subject: [PATCH] 1、大理片：fixbug:大理片出片逻辑修改，钢化版图是否到齐：sql逻辑问题，包含人工出片任务，造成钢化版图是否到齐需要获取已出片的玻璃，造成已出笼的玻璃会重复计算并准备生成钢化任务，但获取的玻璃信息为空，造成插入钢化表异常。且排除已出笼的钢化版图较复杂（暂不关联钢化小片表），目前解决方案：把所有到齐的钢化版图数据查出来，排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 39 +++++++++++----------------------------
1 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
index 1091b84..7ce8d3f 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -237,42 +237,25 @@
//鏌ヨ澶х悊鐗囦俊鎭紝鍓嶇灞曠ず鐢�
@Override
- public List<BigStorageCage> querybigStorageCageDetail(int deviceId) {
- LambdaQueryWrapper<BigStorageCage> bigStorageCageWrapper = new LambdaQueryWrapper<>();
- LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper<>();
- bigStorageCageDetailsWrapper
- .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
- .or()
- .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL);
- if (deviceId != 0) {
- bigStorageCageWrapper.eq(BigStorageCage::getDeviceId, deviceId);
- bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getDeviceId, deviceId);
- }
-
- List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectList(bigStorageCageWrapper);
- log.info("1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭畬鎴愶紝鑾峰彇鍒扮殑鏁版嵁{}", bigStorageCages.size());
-
- List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(bigStorageCageDetailsWrapper);
-
- Map<Integer, List<BigStorageCageDetails>> listMap = bigStorageCageDetailsList.stream().collect(Collectors.groupingBy(BigStorageCageDetails::getSlot));
- for (BigStorageCage bigStorageCage : bigStorageCages) {
- List<BigStorageCageDetails> bigStorageCageDetails = listMap.get(bigStorageCage.getSlot());
- bigStorageCage.setBigStorageCageDetails(bigStorageCageDetails);
- }
- return bigStorageCages;
+ public List<BigStorageCage> querybigStorageCageDetailAll() {
+ MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>();
+ wrapper.selectAll(BigStorageCage.class).selectCollection(BigStorageCageDetails.class, BigStorageCage::getBigStorageCageDetails)
+ .leftJoin(BigStorageCageDetails.class, on -> on.eq(BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
+ .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL));
+ return bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper);
}
//鏌ヨ澶х悊鐗囦俊鎭紝鍓嶇灞曠ず鐢�
@Override
- public List<BigStorageCage> querybigStorageCageDetail() {
+ public Map<Integer, List<BigStorageCage>> querybigStorageCageDetail() {
MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(BigStorageCage.class).selectCollection(BigStorageCageDetails.class, BigStorageCage::getBigStorageCageDetails)
.leftJoin(BigStorageCageDetails.class, on -> on.eq(BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
- .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL))
- .eq(BigStorageCage::getEnableState, Const.SLOT_ON);
-
- return bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper);
+ .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL));
+ List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper);
+ Map<Integer, List<BigStorageCage>> listMap = bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));
+ return listMap;
}
//绗煎瓙浣跨敤鎯呭喌锛岀晫闈㈠睍绀虹敤
--
Gitblit v1.8.0