From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 107 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 84 insertions(+), 23 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 049e341..67232f0 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -8,8 +8,6 @@
import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.mes.bigstorage.entity.BigStorageCageDetails;
-import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
import com.mes.damage.mapper.DamageMapper;
@@ -23,6 +21,7 @@
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.pp.entity.OptimizeDetail;
@@ -59,6 +58,9 @@
UpPattenUsageMapper upPattenUsageMapper;
@Autowired
+ EngineeringMapper engineeringMapper;
+
+ @Autowired
OptimizeDetailMapper optimizeDetailMapper;
@Autowired
@@ -77,9 +79,6 @@
@Autowired
EdgGlassTaskInfoService edgGlassTaskInfoService;
-
- @Autowired
- BigStorageCageDetailsService bigStorageCageDetailsService;
//
// @Override
// public boolean identWorn(Map<String, Object> arguments) {
@@ -122,16 +121,66 @@
*/
@Override
public List<Map<String, Object>> selectCutTerritory() {
+ //鏌ヨEdgStorageCageDetails鏈�鍚庝竴寮犵幓鐠冩墍灞炵増鍥�
List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
.selectAll(UpPattenUsage.class)
+ .distinct()
.innerJoin(Engineering.class, on -> on
.eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
+ .innerJoin(GlassInfo.class, on -> on
+ .eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(GlassInfo::getPatternSequence,UpPattenUsage::getLayoutSequence))
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
+ .leftJoin(Damage.class, on -> on
+ .eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(Damage::getGlassId,GlassInfo::getGlassId))
.eq(Engineering::getState,1)
- .orderByDesc(UpPattenUsage::getState)
- .orderByDesc(UpPattenUsage::getId)
+ .and(wrapper->wrapper.isNotNull(EdgStorageCageDetails::getId).or().isNotNull(Damage::getId))
+ .orderByDesc(UpPattenUsage::getLayoutSequence)
+ .orderByDesc(GlassInfo::getId)
);
if (!upPattenUsage.isEmpty()) {
+ //褰撳墠鐗�
UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
+ //鏌ョ湅褰撳墠鐗堟槸鍚﹀瓨鍦ㄦ湭杩涚瀛愭垨鐮存崯鐨勭幓鐠�
+ List<UpPattenUsage> upPattenUsage2=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ .selectAll(UpPattenUsage.class)
+ .distinct()
+ .innerJoin(GlassInfo.class, on -> on
+ .eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(GlassInfo::getPatternSequence,UpPattenUsage::getLayoutSequence))
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
+ .leftJoin(Damage.class, on -> on
+ .eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(Damage::getGlassId,GlassInfo::getGlassId))
+ .eq(UpPattenUsage::getEngineeringId,upPattenUsage.get(0).getEngineeringId())
+ .eq(UpPattenUsage::getLayoutSequence,upPattenUsage.get(0).getLayoutSequence())
+ .and(wrapper->wrapper.isNull(EdgStorageCageDetails::getId).or().isNull(Damage::getId))
+ .orderByDesc(UpPattenUsage::getLayoutSequence)
+ .orderByDesc(GlassInfo::getId)
+ );
+ //鏄剧ず涓嬩竴鐗� 鍚﹀垯鏄剧ず褰撳墠鐗堝浘
+ if(upPattenUsage2.isEmpty()){
+ //鍓╀綑鐗堝浘
+ List<UpPattenUsage> upPattenUsage3=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ .selectAll(UpPattenUsage.class)
+ .distinct()
+ .innerJoin(Engineering.class, on -> on
+ .eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
+ .eq(Engineering::getState,1)
+ .gt(UpPattenUsage::getLayoutSequence,upPattenUsage1.getLayoutSequence())
+ .orderByAsc(UpPattenUsage::getLayoutSequence)
+ );
+ if(!upPattenUsage3.isEmpty()){
+ //鍒囨崲鎴愪笅涓�鐗堝浘
+ upPattenUsage1=upPattenUsage3.get(0);
+ }
+ }
+
List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
@@ -145,12 +194,14 @@
Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
.selectAll(EdgStorageCageDetails.class)
.eq(EdgStorageCageDetails::getEngineerId,upPattenUsage1.getEngineeringId())
- .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails));
Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
.selectAll(Damage.class)
.eq(Damage::getEngineerId,upPattenUsage1.getEngineeringId())
+ .and(wrapper->wrapper.eq(Damage::getType,8)
+ .or()
+ .eq(Damage::getType,9))
).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage,(V1,V2)->V2));
List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
@@ -159,11 +210,11 @@
if(cutTerritory.get("glass_id")==null||"".equals(cutTerritory.get("glass_id"))){
log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritorys);
return new ArrayList<>();
- }else if(edgMaps.get(cutTerritory.get("glass_id"))!=null){
- cutTerritory.put("glass_state",edgMaps.get(cutTerritory.get("glass_id")).getState());
}else if(damageMaps.get(cutTerritory.get("glass_id"))!=null){
//log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
- cutTerritory.put("glass_state",damageMaps.get(cutTerritory.get("glass_id")).getStatus());
+ cutTerritory.put("glass_state",damageMaps.get(cutTerritory.get("glass_id")).getType());
+ }else if(edgMaps.get(cutTerritory.get("glass_id"))!=null){
+ cutTerritory.put("glass_state",edgMaps.get(cutTerritory.get("glass_id")).getState());
}else{
cutTerritory.put("glass_state",0);
}
@@ -182,13 +233,15 @@
*/
@Override
public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {
- //澶х悊鐗囩杩涜繃鐨勭幓鐠�
- Map<String, BigStorageCageDetails> mapBigCage=bigStorageCageDetailsService.list(
- new LambdaQueryWrapper<BigStorageCageDetails>()
- .eq(BigStorageCageDetails::getEngineerId,current)
- .gt(BigStorageCageDetails::getState,Const.GLASS_STATE_NEW)
- ).stream().collect(Collectors.toMap(BigStorageCageDetails::getGlassId,BigStorageCageDetails->BigStorageCageDetails,(V1,V2)->V2));;
+ List<Engineering> engineering=engineeringMapper.selectJoinList(Engineering.class, new MPJLambdaWrapper<Engineering>()
+ .selectAll(Engineering.class)
+ .eq(Engineering::getEngineerId,current)
+ );
+ if(engineering.size()==0){
+ log.info("褰撳墠宸ョ▼鍙锋湭棰嗗彇杩�:{}",current);
+ return new ArrayList<>();
+ }
//缁撴灉
List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
//姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
@@ -205,12 +258,14 @@
Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
.selectAll(EdgStorageCageDetails.class)
.eq(EdgStorageCageDetails::getEngineerId,current)
- .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails,(V1,V2)->V2));
Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
.selectAll(Damage.class)
.eq(Damage::getEngineerId,current)
+ .and(wrapper->wrapper.eq(Damage::getType,8)
+ .or()
+ .eq(Damage::getType,9))
).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage,(V1,V2)->V2));
for (Map<String, Object> item : cutTerritory) {
@@ -221,10 +276,7 @@
}
if(damageMaps.get(item.get("glass_id"))!=null){
//log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
- item.put("glass_state",damageMaps.get(item.get("glass_id")).getStatus());
- }else if(mapBigCage.get(item.get("glass_id"))!=null){
- //杩涜繃澶х悊鐗囩
- item.put("glass_state",98);
+ item.put("glass_state",damageMaps.get(item.get("glass_id")).getType());
}else if(edgMaps.get(item.get("glass_id"))!=null){
item.put("glass_state",edgMaps.get(item.get("glass_id")).getState());
}else{
@@ -234,7 +286,16 @@
}
Map<String, List<Map<String, Object>>> groupBy=resultCutTerritory.stream().collect(Collectors.groupingBy(item->item.get("stock_id").toString()));
// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
- return new ArrayList<>(groupBy.values());
+ int count=1;
+ List<List<Map<String, Object>>> result=new ArrayList<>();
+ for (String item : groupBy.keySet()) {
+ String key=count+"";
+ if(key!=null){
+ result.add(groupBy.get(key));
+ }
+ count++;
+ }
+ return result;
}
/**
--
Gitblit v1.8.0