From dd60bcc7b38c2a19c02a20550a393987fc5a5a27 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 07 八月 2024 16:26:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 220 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 170 insertions(+), 50 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 322ea68..acf0dff 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
@@ -7,11 +7,16 @@
import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.common.config.Const;
+import com.mes.damage.entity.Damage;
+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.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.pp.entity.OptimizeDetail;
import com.mes.pp.entity.OptimizeLayout;
import com.mes.pp.mapper.OptimizeDetailMapper;
@@ -24,7 +29,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+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;
@@ -41,35 +48,73 @@
@Slf4j
public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
- @Resource
+ @Autowired
UpPattenUsageMapper upPattenUsageMapper;
@Autowired
OptimizeDetailMapper optimizeDetailMapper;
- @Resource
+ @Autowired
EdgStorageCageMapper edgStorageCageMapper;
+ @Autowired
+ GlassInfoMapper glassInfoMapper;
@Autowired
TaskCacheService taskCacheService;
+
+ @Autowired
+ DamageService damageService;
/**
* 璇嗗埆 鎷胯蛋:200/鐮存崯:201
*
- * @param glassId
- * @param ControlsId
+ * @param arguments
* @return
*/
@Override
- public boolean identWorn(String glassId, int ControlsId) {
- List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
+ 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()){
+ 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));
+ if (GlassInfos.size() == 1) {
+ Damage damage =new Damage();
+ damage.setGlassId(glassId);
+ damage.setLine(line);
+ damage.setWorkingProcedure(machine);
+ damage.setRemark("");
+ damage.setStatus(state);//201鐮存崯锛�200鎷胯蛋 =銆嬬牬鎹熻〃 2鐮存崯 3 鎷胯蛋
+ 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(ControlsId);
- baseMapper.update(edgStorageCageDetails.get(0), new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
- return true;
+ item.setState(controlsId);
+ 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) {
@@ -78,7 +123,7 @@
// baseMapper.update(edgStorageCageDetails.get(0), new QueryWrapper<EdgStorageCageDetails>().eq("glass_id", glassId));
// return true;
// }
- return false;
+ return true;
}
/**
@@ -90,20 +135,35 @@
public List<Map<String, Object>> selectCutTerritory() {
List<UpPattenUsage> upPattenUsage = upPattenUsageMapper.selectList(new MPJLambdaWrapper<UpPattenUsage>()
.selectAll(UpPattenUsage.class)
- .eq(UpPattenUsage::getState, 1));
-
+ .orderByDesc(UpPattenUsage::getState)
+ .orderByDesc(UpPattenUsage::getId));
if (!upPattenUsage.isEmpty()) {
UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
- return optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ 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<>();
+ 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());
+ }else{
+ cutTerritory.put("glass_state",0);
+ }
+ ResultcutTerritorys.add(cutTerritory);
+ }
+ return ResultcutTerritorys;
// Sql鐗堟湰
// return optimizeDetailMapper.selectJoinMaps(new MPJQueryWrapper<OptimizeDetail>().selectAll(OptimizeDetail.class)
@@ -123,17 +183,40 @@
* @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>> ResultcutTerritorys=new ArrayList<>();
+ //姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
+ 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, 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));
+ for (Map<String, Object> cutTerritory : cutTerritorys) {
+// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
+ 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{
+ cutTerritory.put("glass_state",0);
+ }
+ ResultcutTerritorys.add(cutTerritory);
+ }
+ Map<String, List<Map<String, Object>>> groupBy=ResultcutTerritorys.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());
//Sql鐗堟湰
// return optimizeDetailMapper.selectJoinMaps(new MPJQueryWrapper<OptimizeDetail>().selectAll(OptimizeDetail.class)
// .select("ol.width as olwidth","ol.height as olheight")
@@ -146,27 +229,78 @@
* 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿
*
* @param glassId
- * @param poor
+ * @param threshold
* @return
*/
@Override
- public EdgStorageCageDetails selectConformGlass(String glassId, int poor) {
+ public EdgStorageCageDetails selectConformGlass(String glassId, int threshold) {
//1.鍘荤鍐呮煡璇㈡灏哄鐨勭幓鐠� 鐩墠鐗堝浘宸�煎唴鐨勭幓鐠� 鏄惁鏈夊悓灏哄鐨�
//1.1 鏈夊悓灏哄鐨� 鍒欑敓鎴愬悓灏哄鐨勪换鍔�
//1.2 鏃犲悓灏哄鐨� 鍒欑敓鎴愮増鍥鹃『搴忔渶灏忕殑鍑虹墖
- log.info("鎸夌収鐜荤拑id锛歿}鑾峰彇鐜荤拑淇℃伅", glassId);
+ EdgStorageCageDetails edgStorageCageDetails = baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ .selectAll(EdgStorageCageDetails.class)
+ .eq(EdgStorageCageDetails::getGlassId, glassId)
+ );
+ List<EdgStorageCageDetails> listEdgStorageCageDetails = baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .lt(EdgStorageCageDetails::getState, 200)
+ .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
+ );
+ EdgStorageCageDetails minTemperingLayoutId = new EdgStorageCageDetails();
+ if (!listEdgStorageCageDetails.isEmpty()) {
+ minTemperingLayoutId = listEdgStorageCageDetails.get(0);
+ }
+ EdgStorageCageDetails result = new EdgStorageCageDetails();
+ if (edgStorageCageDetails != null && minTemperingLayoutId != null) {
+ result = edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class, new MPJLambdaWrapper<EdgStorageCage>()
+ .selectAll(EdgStorageCageDetails.class)
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
+ .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot))
+ .isNotNull(EdgStorageCageDetails::getSlot)
+ .eq(EdgStorageCageDetails::getWidth, edgStorageCageDetails.getWidth())
+ .eq(EdgStorageCageDetails::getHeight, edgStorageCageDetails.getHeight())
+ .ge(EdgStorageCageDetails::getTemperingLayoutId, minTemperingLayoutId.getTemperingLayoutId())
+ .le(EdgStorageCageDetails::getTemperingLayoutId, minTemperingLayoutId.getTemperingLayoutId() + threshold)
+ .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
+ );
+ }
+
+ if (result == null) {
+ result = edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class, new MPJLambdaWrapper<EdgStorageCage>()
+ .selectAll(EdgStorageCageDetails.class)
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
+ .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot))
+ .isNotNull(EdgStorageCageDetails::getSlot)
+ .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
+ );
+ }
+ return result;
+ }
+
+ /**
+ * 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿
+ *
+ * @param glassId
+ * @param threshold
+ * @return
+ */
+ @Override
+ public EdgStorageCageDetails selectOutGlass(String glassId, int threshold) {
EdgStorageCageDetails oldEdgStorageCageDetails = null;
if (StringUtils.isNotEmpty(glassId)) {
oldEdgStorageCageDetails = baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
.selectAll(EdgStorageCageDetails.class)
.eq(EdgStorageCageDetails::getGlassId, glassId));
}
+ log.info("鎸夌収鐜荤拑id锛歿}鑾峰彇鐜荤拑淇℃伅{}", glassId, oldEdgStorageCageDetails);
LambdaQueryWrapper<TaskCache> wrapper = new LambdaQueryWrapper<TaskCache>().select(TaskCache::getGlassId).eq(TaskCache::getTaskType, "2");
List<TaskCache> taskCacheList = taskCacheService.list(wrapper);
List<String> glassIds = taskCacheList.stream().map(TaskCache::getGlassId).collect(Collectors.toList());
log.info("鑾峰彇绗煎唴鎵�鏈夊凡鍑虹墖鐨勭幓鐠僫d淇℃伅:{}", glassIds);
+ //鑾峰彇绗煎唴鏈�灏忕増鍥緄d鍙婄増搴忎负鏈�灏忕殑鐜荤拑淇℃伅锛堢幓鐠僫d涓嶅湪浠诲姟琛ㄤ腑鐨勫嚭鐗囪褰曚腑锛�
EdgStorageCageDetails minTemperingLayoutId = baseMapper.selectOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
.eq(EdgStorageCageDetails::getState, 100)
.notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
@@ -177,38 +311,24 @@
minTemperingLayoutId.getTemperingFeedSequence(), minTemperingLayoutId);
EdgStorageCageDetails outEdgStorageCageDetails = null;
- if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {
- log.info("鎸夌収涓婁竴鐗囧凡鍑虹幓鐠冨搴}锛岄珮搴}锛屽強鐗堝浘id鍖洪棿{}鍒皗}鑾峰彇鍑虹墖浠诲姟鐜荤拑淇℃伅", oldEdgStorageCageDetails.getWidth()
- , oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + poor);
- outEdgStorageCageDetails = edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class, new MPJLambdaWrapper<EdgStorageCage>()
- .selectAll(EdgStorageCageDetails.class)
- .leftJoin(EdgStorageCageDetails.class, on -> on
- .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
- .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot))
- .isNotNull(EdgStorageCageDetails::getSlot)
- .eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())
- .eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())
- .ge(EdgStorageCageDetails::getTemperingLayoutId, minTemperingLayoutId.getTemperingLayoutId())
- .le(EdgStorageCageDetails::getTemperingLayoutId, minTemperingLayoutId.getTemperingLayoutId() + poor)
- .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
- .last("limit 1")
- );
- log.info("鍑虹墖浠诲姟鐨勭幓鐠冧俊鎭細{}", outEdgStorageCageDetails);
- }
+// 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);
+ }
if (outEdgStorageCageDetails == null) {
outEdgStorageCageDetails = minTemperingLayoutId;
-// outEdgStorageCageDetails = edgStorageCageMapper.selectJoinOne(EdgStorageCageDetails.class, new MPJLambdaWrapper<EdgStorageCage>()
-// .selectAll(EdgStorageCageDetails.class)
-// .leftJoin(EdgStorageCageDetails.class, on -> on
-// .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
-// .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot))
-// .isNotNull(EdgStorageCageDetails::getSlot)
-// .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
-// .last("limit 1")
-// );
}
return outEdgStorageCageDetails;
}
-
}
--
Gitblit v1.8.0