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 | 254 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 176 insertions(+), 78 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 d0f8f5c..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
@@ -2,6 +2,7 @@
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJLambdaQueryWrapper;
@@ -11,6 +12,9 @@
import com.mes.damage.entity.Damage;
import com.mes.damage.mapper.DamageMapper;
import com.mes.damage.service.DamageService;
+import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
+import com.mes.edgglasstask.entity.request.IdentWornRequest;
+import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
@@ -29,12 +33,11 @@
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.print.attribute.standard.MediaSize;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -55,16 +58,13 @@
UpPattenUsageMapper upPattenUsageMapper;
@Autowired
+ EngineeringMapper engineeringMapper;
+
+ @Autowired
OptimizeDetailMapper optimizeDetailMapper;
@Autowired
EdgStorageCageMapper edgStorageCageMapper;
- @Autowired
- DamageMapper damageMapper;
-
- @Autowired
- EngineeringMapper engineeringMapper;
-
@Autowired
GlassInfoMapper glassInfoMapper;
@@ -72,50 +72,48 @@
TaskCacheService taskCacheService;
@Autowired
+ DamageMapper damageMapper;
+
+ @Autowired
DamageService damageService;
-
- /**
- * 璇嗗埆 鎷胯蛋:200/鐮存崯:201
- *
- * @param arguments
- * @return
- */
- @Override
- public boolean identWorn(Map<String,Object> arguments) {
- String glassId=arguments.get("glassId").toString();
- int state=arguments.get("state").toString().isEmpty()?0:Integer.parseInt(arguments.get("state").toString());
- int line=arguments.get("line").toString().isEmpty()?0:Integer.parseInt(arguments.get("line").toString());
- String workingProcedure=arguments.get("workingProcedure").toString();
- if(state==0||line==0||workingProcedure==null||glassId==null||glassId.isEmpty()){
- log.info("鍓嶇浼犻�掓暟鎹笉鍏�:{}",arguments);
- return false;
- }
- List<GlassInfo> GlassInfos = glassInfoMapper.selectList(new MPJLambdaQueryWrapper<GlassInfo>()
- .selectAll(GlassInfo.class)
- .eq(GlassInfo::getGlassId, glassId));
- if (GlassInfos.size() == 1) {
- Damage damage =new Damage();
- damage.setGlassId(glassId);
- damage.setLine(line);
- damage.setWorkingProcedure(workingProcedure);
- damage.setRemark("");
- damage.setStatus(state);//8鐮存崯锛�9鎷胯蛋
- damageService.insertDamage(damage);
- }else{
- return false;
- }
- List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
- .selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getGlassId, glassId));
- if (edgStorageCageDetails.size() == 1) {
- EdgStorageCageDetails item = edgStorageCageDetails.get(0);
- item.setState(state);
- baseMapper.update(item, new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
- }
- return true;
- }
-
+ @Autowired
+ EdgGlassTaskInfoService edgGlassTaskInfoService;
+//
+// @Override
+// public boolean identWorn(Map<String, Object> arguments) {
+// String glassId=arguments.get("glassId").toString();
+// int state=arguments.get("state").toString().isEmpty()?0:Integer.parseInt(arguments.get("state").toString());
+// int line=arguments.get("line").toString().isEmpty()?0:Integer.parseInt(arguments.get("line").toString());
+// String workingProcedure=arguments.get("workingProcedure").toString();
+// if(state==0||line==0||workingProcedure==null||glassId==null||glassId.isEmpty()){
+// log.info("鍓嶇浼犻�掓暟鎹笉鍏�:{}",arguments);
+// return false;
+// }
+// List<GlassInfo> GlassInfos = glassInfoMapper.selectList(new MPJLambdaQueryWrapper<GlassInfo>()
+// .selectAll(GlassInfo.class)
+// .eq(GlassInfo::getGlassId, glassId));
+// if (GlassInfos.size() == 1) {
+// Damage damage =new Damage();
+// damage.setGlassId(glassId);
+// damage.setLine(line);
+// damage.setWorkingProcedure(workingProcedure);
+// damage.setRemark("");
+// damage.setStatus(state);//8鐮存崯锛�9鎷胯蛋
+// damageService.insertDamage(damage);
+// }else{
+// return false;
+// }
+// List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+// .selectAll(EdgStorageCageDetails.class)
+// .eq(EdgStorageCageDetails::getGlassId, glassId));
+// if (edgStorageCageDetails.size() == 1) {
+// EdgStorageCageDetails item = edgStorageCageDetails.get(0);
+// item.setState(state);
+// baseMapper.update(item, new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
+// }
+// return true;
+// }
/**
* 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
*
@@ -123,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")
@@ -146,13 +194,15 @@
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())
- ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage));
+ .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<>();
for (Map<String, Object> cutTerritory : cutTerritorys) {
@@ -160,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);
}
@@ -183,6 +233,15 @@
*/
@Override
public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {
+
+ 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<>();
//姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
@@ -199,24 +258,27 @@
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));
+ ).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)
- ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage));
+ .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) {
-// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
+// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
if(item.get("glass_id")==null||"".equals(item.get("glass_id"))){
log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritory);
return new ArrayList<>();
+ }
+ 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")).getType());
}else if(edgMaps.get(item.get("glass_id"))!=null){
item.put("glass_state",edgMaps.get(item.get("glass_id")).getState());
- }else 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{
item.put("glass_state",0);
}
@@ -224,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;
}
/**
@@ -315,22 +386,49 @@
EdgStorageCageDetails outEdgStorageCageDetails = null;
// if (queryMaxMinDiff(threshold))
- //todo:閫昏緫1锛氳幏鍙栦袱鏉＄嚎宸插嚭鏈�鍚庝竴鍧楃幓鐠冨湪绗煎唴鐩稿悓灏哄鎵�鍓╂暟閲忥紝浼樺厛璧版暟閲忓皯鐨勭嚎
- //todo:闇�瑕佸湪鍗у紡鐞嗙墖绗艰鎯呰〃涓柊澧炵姸鎬侊紝鐢ㄦ潵琛ㄧず鐜荤拑杩涘嚭鐞嗙墖绗兼儏鍐�
- if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {
- log.info("鎸夌収涓婁竴鐗囧凡鍑虹幓鐠冨搴}锛岄珮搴}锛屽強鐗堝浘id鍖洪棿{}鍒皗}鑾峰彇鍑虹墖浠诲姟鐜荤拑淇℃伅", oldEdgStorageCageDetails.getWidth()
- , oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + threshold);
- outEdgStorageCageDetails = this.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
- .notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
- .eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())
- .eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())
- .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
- .last("limit 1"));
- log.info("鍑虹墖浠诲姟鐨勭幓鐠冧俊鎭細{}", outEdgStorageCageDetails);
- }
+ //todo:閫昏緫1锛氳幏鍙栦袱鏉＄嚎宸插嚭鏈�鍚庝竴鍧楃幓鐠冨湪绗煎唴鐩稿悓灏哄鎵�鍓╂暟閲忥紝浼樺厛璧版暟閲忓皯鐨勭嚎
+ //todo:闇�瑕佸湪鍗у紡鐞嗙墖绗艰鎯呰〃涓柊澧炵姸鎬侊紝鐢ㄦ潵琛ㄧず鐜荤拑杩涘嚭鐞嗙墖绗兼儏鍐�
+ if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {
+ log.info("鎸夌収涓婁竴鐗囧凡鍑虹幓鐠冨搴}锛岄珮搴}锛屽強鐗堝浘id鍖洪棿{}鍒皗}鑾峰彇鍑虹墖浠诲姟鐜荤拑淇℃伅", oldEdgStorageCageDetails.getWidth()
+ , oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + threshold);
+ outEdgStorageCageDetails = this.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
+ .eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())
+ .eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())
+ .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
+ .last("limit 1"));
+ log.info("鍑虹墖浠诲姟鐨勭幓鐠冧俊鎭細{}", outEdgStorageCageDetails);
+ }
if (outEdgStorageCageDetails == null) {
outEdgStorageCageDetails = minTemperingLayoutId;
}
return outEdgStorageCageDetails;
}
+
+ @Override
+ public String identControls(IdentWornRequest request) {
+ //灏嗚瘑鍒牬鎹熺殑鐜荤拑鐩存帴鍔犲叆鐮存崯琛�
+ Damage damage = new Damage();
+ BeanUtils.copyProperties(request, damage);
+ damage.setType(request.getState());
+ damage.setRemark("");
+ damage.setStatus(0);
+ damageService.insertDamage(damage);
+ return "success";
+ }
+
+ @Override
+ public String edgReportStatus(IdentWornRequest request) {
+ //灏嗙（杈归槦鍒楃牬鎹熺殑鐜荤拑鐩存帴鍔犲叆鐮存崯琛�
+ Damage damage = new Damage();
+ BeanUtils.copyProperties(request, damage);
+ damage.setType(request.getState());
+ damage.setRemark("");
+ damage.setStatus(0);
+ damageService.insertDamage(damage);
+ //淇敼纾ㄨ竟闃熷垪鏁版嵁鐘舵��
+ edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
+ .set(EdgGlassTaskInfo::getStatus, request.getState()).eq(EdgGlassTaskInfo::getGlassId, request.getGlassId()));
+ return "success";
+ }
}
--
Gitblit v1.8.0