From 3cc6aa69cca0b0d991f8537999c578eaee68e07e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 25 四月 2024 14:33:24 +0800
Subject: [PATCH] 提交项目多环境配置
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 113 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 80 insertions(+), 33 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 e5339fb..64837c0 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
@@ -1,21 +1,24 @@
package com.mes.edgstoragecage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.github.yulichang.query.MPJQueryWrapper;
-import com.github.yulichang.wrapper.interfaces.LambdaJoin;
-import com.mes.edgstoragecage.entity.EdgStorageCage;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
-import com.mes.taskcache.mapper.HangzhouMesMapper;
+import com.mes.pp.entity.OptimizeDetail;
+import com.mes.pp.entity.OptimizeLayout;
+import com.mes.pp.mapper.OptimizeDetailMapper;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* <p>
@@ -30,47 +33,91 @@
@Autowired
UpPattenUsageMapper upPattenUsageMapper;
+ @Autowired
+ OptimizeDetailMapper optimizeDetailMapper;
- //璇嗗埆 鐮存崯/鎷胯蛋
- public boolean identWorn(String glassid, int ControlsId) {
- List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ /**
+ * 璇嗗埆 鎷胯蛋:200/鐮存崯:201
+ * @param glassId
+ * @param ControlsId
+ * @return
+ */
+ public boolean identWorn(String glassId, int ControlsId) {
+ List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId,glassId));
if (edgStorageCageDetails.size() == 1) {
- baseMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glassid", glassid));
+ EdgStorageCageDetails item=edgStorageCageDetails.get(0);
+ item.setState(ControlsId);
+ baseMapper.update(edgStorageCageDetails.get(0), new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId,glassId));
return true;
}
+// 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 false;
}
- //鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+ /**
+ * 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+ * @return
+ */
@Override
- public List<Map> selectCutTerritory() {
- List<Map> list = upPattenUsageMapper.selectJoinList(
- Map.class, new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
- .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
- .select("gi.x_coordinate","gi.y_coordinate","gi.tempering_feed_sequence")
- .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
- .leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
- .eq("t.state", 1)
- .orderByAsc("t.layout_sequence")
- );
- return list;
+ public List<Map<String, Object>> selectCutTerritory() {
+ List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectList(new MPJLambdaWrapper<UpPattenUsage>()
+ .selectAll(UpPattenUsage.class)
+ .eq(UpPattenUsage::getState, 1));
+
+ if(!upPattenUsage.isEmpty()){
+ UpPattenUsage upPattenUsage1=upPattenUsage.get(0);
+ return optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ .selectAll(OptimizeDetail.class)
+ .selectAs(OptimizeLayout::getWidth,"olWidth")
+ .selectAs(OptimizeLayout::getWidth,"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())
+ );
+
+// 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 null;
}
- //鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ /**
+ * 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ * @param current
+ * @return
+ */
@Override
- public List<Map> selectCurrentCutTerritory(String current) {
- List<Map> list = baseMapper.selectJoinList(
- Map.class, new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
- .select("escd.glass_id", "escd.flow_card_id", "escd.width", "escd.height")
- .leftJoin("glass_info gi on t.layout_sequence=gi.pattern_sequence and t.engineering_id=gi.engineer_id")
- .leftJoin("edg_storage_cage_details escd on gi.id=escd.glass_id")
- .eq("t.engineering_id", current)
- .orderByAsc("t.layout_sequence")
+ public List<Map<String, Object>> selectCurrentCutTerritory(String current) {
+
+ return optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ .selectAll(OptimizeDetail.class)
+ .selectAs(OptimizeLayout::getWidth,"olWidth")
+ .selectAs(OptimizeLayout::getWidth,"olHeight")
+ .leftJoin(OptimizeLayout.class,on->on
+ .eq(OptimizeLayout::getProjectNo,OptimizeDetail::getProjectNo)
+ .eq(OptimizeLayout::getStockId,OptimizeDetail::getStockId))
+ .eq(OptimizeDetail::getProjectNo, current)
);
- return list;
+//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)
+// );
}
-
- ;
-
}
--
Gitblit v1.8.0