From 4829439b3c4d52ecee6e9858068552b2f9d8ac79 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 17 七月 2024 14:17:34 +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 | 186 ++++++++++++++++++++++++++++++++++------------
1 files changed, 136 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 d3d0768..481483a 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,12 +1,13 @@
package com.mes.edgstoragecage.service.impl;
+import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJLambdaQueryWrapper;
-import com.github.yulichang.query.MPJQueryWrapper;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.common.config.Const;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
@@ -16,13 +17,19 @@
import com.mes.pp.entity.OptimizeLayout;
import com.mes.pp.mapper.OptimizeDetailMapper;
import com.mes.taskcache.entity.TaskCache;
+import com.mes.taskcache.service.TaskCacheService;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
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.List;
import java.util.Map;
-import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -33,28 +40,36 @@
* @since 2024-04-07
*/
@Service
+@Slf4j
public class EdgStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
@Autowired
UpPattenUsageMapper upPattenUsageMapper;
+
@Autowired
OptimizeDetailMapper optimizeDetailMapper;
@Autowired
EdgStorageCageMapper edgStorageCageMapper;
+ @Autowired
+ TaskCacheService taskCacheService;
+
+
/**
* 璇嗗埆 鎷胯蛋:200/鐮存崯:201
+ *
* @param glassId
* @param ControlsId
* @return
*/
+ @Override
public boolean identWorn(String glassId, int ControlsId) {
- List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId,glassId));
+ List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
if (edgStorageCageDetails.size() == 1) {
- EdgStorageCageDetails item=edgStorageCageDetails.get(0);
+ EdgStorageCageDetails item = edgStorageCageDetails.get(0);
item.setState(ControlsId);
- baseMapper.update(edgStorageCageDetails.get(0), new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId,glassId));
+ baseMapper.update(item, new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
return true;
}
// Sql鐗堟湰
@@ -70,26 +85,42 @@
/**
* 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
+ *
* @return
*/
@Override
public List<Map<String, Object>> selectCutTerritory() {
- List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectList(new MPJLambdaWrapper<UpPattenUsage>()
+ 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)
+ .orderByDesc(UpPattenUsage::getState)
+ .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")
- .leftJoin(OptimizeLayout.class,on->on
- .eq(OptimizeLayout::getProjectNo,OptimizeDetail::getProjectNo)
- .eq(OptimizeLayout::getStockId,OptimizeDetail::getStockId))
+ .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())
+ .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)
@@ -104,6 +135,7 @@
/**
* 鑾峰彇 宸ョ▼涓嬬殑褰撳墠鐗堝浘
+ *
* @param current
* @return
*/
@@ -112,11 +144,11 @@
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))
+ .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)
);
//Sql鐗堟湰
@@ -129,54 +161,108 @@
/**
* 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿
+ *
* @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 鏃犲悓灏哄鐨� 鍒欑敓鎴愮増鍥鹃『搴忔渶灏忕殑鍑虹墖
- EdgStorageCageDetails edgStorageCageDetails= baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ EdgStorageCageDetails edgStorageCageDetails = baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
.selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getGlassId,glassId)
+ .eq(EdgStorageCageDetails::getGlassId, glassId)
);
- List<EdgStorageCageDetails> listEdgStorageCageDetails= baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
- .lt(EdgStorageCageDetails::getState,200)
- .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
+ 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 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>()
+ 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))
+ .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()+poor)
- .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
+ .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>()
+ 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))
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getDeviceId, EdgStorageCage::getDeviceId)
+ .eq(EdgStorageCageDetails::getSlot, EdgStorageCage::getSlot))
.isNotNull(EdgStorageCageDetails::getSlot)
- .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId,EdgStorageCageDetails::getTemperingFeedSequence)
+ .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)
+ .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
+ .last("limit 1"));
+ Assert.isTrue(minTemperingLayoutId != null, "绗煎唴鏃犵鍚堣姹傜殑鐜荤拑");
+ log.info("鑾峰彇绗煎唴鏈�灏忕増鍥緄d{}鍙婄増搴忎负{}鐨勭幓鐠冧俊鎭瘂}", minTemperingLayoutId.getTemperingLayoutId(),
+ minTemperingLayoutId.getTemperingFeedSequence(), minTemperingLayoutId);
+
+ 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);
+ }
+ if (outEdgStorageCageDetails == null) {
+ outEdgStorageCageDetails = minTemperingLayoutId;
+ }
+ return outEdgStorageCageDetails;
+ }
}
--
Gitblit v1.8.0