From 051613aa73be3e75af5a6dfdb86a722bcb5af094 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 23 八月 2024 16:46:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 142 ++++++++++++++++++++++++++++-------------------
1 files changed, 84 insertions(+), 58 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 b4c28b8..eef3b5d 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
@@ -9,12 +9,15 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
+import com.mes.damage.mapper.DamageMapper;
import com.mes.damage.service.DamageService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
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;
@@ -31,6 +34,7 @@
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;
@@ -56,6 +60,12 @@
@Autowired
EdgStorageCageMapper edgStorageCageMapper;
@Autowired
+ DamageMapper damageMapper;
+
+ @Autowired
+ EngineeringMapper engineeringMapper;
+
+ @Autowired
GlassInfoMapper glassInfoMapper;
@Autowired
@@ -72,25 +82,15 @@
* @return
*/
@Override
- public boolean identWorn(Map<String, String> arguments) {
- String glassId=arguments.get("glassId");
- int controlsId=arguments.get("controlsId").isEmpty()?0:Integer.parseInt(arguments.get("controlsId"));
- int line=arguments.get("line").isEmpty()?0:Integer.parseInt(arguments.get("line"));
- String machine=arguments.get("machine");
- if(controlsId==0||line==0||machine==null||glassId==null||glassId.isEmpty()){
+ 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;
}
- int state;
- if(controlsId==200||controlsId==201){
- state=controlsId==200?3:2;
- }else if (controlsId==300||controlsId==301){
- state=controlsId==300?3:2;
- }else{
- log.info("鍓嶇浼犻�掔姸鎬佷笉鍚堟硶:{}",arguments);
- return false;
- }
-
List<GlassInfo> GlassInfos = glassInfoMapper.selectList(new MPJLambdaQueryWrapper<GlassInfo>()
.selectAll(GlassInfo.class)
.eq(GlassInfo::getGlassId, glassId));
@@ -98,9 +98,9 @@
Damage damage =new Damage();
damage.setGlassId(glassId);
damage.setLine(line);
- damage.setWorkingProcedure(machine);
+ damage.setWorkingProcedure(workingProcedure);
damage.setRemark("");
- damage.setStatus(state);//201鐮存崯锛�200鎷胯蛋 =銆嬬牬鎹熻〃 2鐮存崯 3 鎷胯蛋
+ damage.setStatus(state);//8鐮存崯锛�9鎷胯蛋
damageService.insertDamage(damage);
}else{
return false;
@@ -110,18 +110,9 @@
.eq(EdgStorageCageDetails::getGlassId, glassId));
if (edgStorageCageDetails.size() == 1) {
EdgStorageCageDetails item = edgStorageCageDetails.get(0);
- item.setState(controlsId);
+ item.setState(state);
baseMapper.update(item, new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
}
-
-// Sql鐗堟湰
-// List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glass_id", glassId));
-// if (edgStorageCageDetails.size() == 1) {
-// EdgStorageCageDetails item=edgStorageCageDetails.get(0);
-// item.setState(ControlsId);
-// baseMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glass_id", glassId));
-// return true;
-// }
return true;
}
@@ -132,45 +123,54 @@
*/
@Override
public List<Map<String, Object>> selectCutTerritory() {
- List<UpPattenUsage> upPattenUsage = upPattenUsageMapper.selectList(new MPJLambdaWrapper<UpPattenUsage>()
+ List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
.selectAll(UpPattenUsage.class)
+ .innerJoin(Engineering.class, on -> on
+ .eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
+ .eq(Engineering::getState,1)
.orderByDesc(UpPattenUsage::getState)
- .orderByDesc(UpPattenUsage::getId));
+ .orderByDesc(UpPattenUsage::getId)
+ );
if (!upPattenUsage.isEmpty()) {
UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
- .selectAs(OptimizeLayout::getWidth, "olHeight")
+ .selectAs(OptimizeLayout::getHeight, "olHeight")
.leftJoin(OptimizeLayout.class, on -> on
.eq(OptimizeLayout::getProjectNo, OptimizeDetail::getProjectNo)
.eq(OptimizeLayout::getStockId, OptimizeDetail::getStockId))
.eq(OptimizeDetail::getProjectNo, upPattenUsage1.getEngineeringId())
.eq(OptimizeDetail::getStockId, upPattenUsage1.getLayoutSequence())
);
- List<Map<String, Object>> ResultcutTerritorys=new ArrayList<>();
+ 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,(V1,V2)->V2));
+
+ List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
for (Map<String, Object> cutTerritory : cutTerritorys) {
- EdgStorageCageDetails edgStorageCageDetails=baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
- .selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getGlassId, cutTerritory.get("glass_id"))
- .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
- if(edgStorageCageDetails!=null){
- cutTerritory.put("glass_state",edgStorageCageDetails.getState());
+ 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());
}else{
cutTerritory.put("glass_state",0);
}
- ResultcutTerritorys.add(cutTerritory);
+ resultCutTerritory.add(cutTerritory);
}
- return ResultcutTerritorys;
-
-// Sql鐗堟湰
-// return optimizeDetailMapper.selectJoinMaps(new MPJQueryWrapper<OptimizeDetail>().selectAll(OptimizeDetail.class)
-// .select("ol.width as olwidth","ol.height as olheight")
-// .leftJoin("optimize_layout ol on t.project_no=ol.project_no and t.stock_id=ol.stock_id")
-// .eq("t.project_no", upPattenUsage1.getEngineeringId())
-// .eq("t.stock_id",upPattenUsage1.getLayoutSequence())
-// );
+ return resultCutTerritory;
}
return null;
}
@@ -182,23 +182,49 @@
* @return
*/
@Override
- public List<Map<String, Object>> selectCurrentCutTerritory(String current) {
-
- return optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {
+ //缁撴灉
+ List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
+ //姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
+ List<Map<String, Object>> cutTerritory=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
- .selectAs(OptimizeLayout::getWidth, "olHeight")
+ .selectAs(OptimizeLayout::getHeight, "olHeight")
.leftJoin(OptimizeLayout.class, on -> on
.eq(OptimizeLayout::getProjectNo, OptimizeDetail::getProjectNo)
.eq(OptimizeLayout::getStockId, OptimizeDetail::getStockId))
.eq(OptimizeDetail::getProjectNo, current)
);
-//Sql鐗堟湰
-// return optimizeDetailMapper.selectJoinMaps(new MPJQueryWrapper<OptimizeDetail>().selectAll(OptimizeDetail.class)
-// .select("ol.width as olwidth","ol.height as olheight")
-// .leftJoin("optimize_layout ol on t.project_no=ol.project_no and t.stock_id=ol.stock_id")
-// .eq("t.project_no",current)
-// );
+
+ 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)
+ ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage));
+
+ for (Map<String, Object> item : cutTerritory) {
+// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
+ if(item.get("glass_id")==null||"".equals(item.get("glass_id"))){
+ log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritory);
+ return new ArrayList<>();
+ }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);
+ }
+ resultCutTerritory.add(item);
+ }
+ 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());
}
/**
--
Gitblit v1.8.0