From 0aef9abcba7f6e2cd41e330f397760cb8147c9b7 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 18 七月 2024 08:38:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 261 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 185 insertions(+), 76 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index 012ef6c..96d4e3b 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -1,8 +1,14 @@
package com.mes.bigstorage.service.impl;
+import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.entity.BigStorageDTO;
+import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
+import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
@@ -10,14 +16,18 @@
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper;
+import com.mes.common.config.Const;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -44,36 +54,68 @@
@Resource
private GlassInfoMapper glassInfoMapper;
+ @Value("${mes.minCount}")
+ private int minCount;
+
+ @Value("${mes.slotWidth}")
+ private Integer slotWidth;
+
+ @Value("${mes.glassGap}")
+ private Integer glassGap;
+
/**
* 鏌ヨ杩�/鍑虹墖浠诲姟
*/
@Override
public List<BigStorageCageDetails> selectTask(int taskType) {
- if(taskType==1){
+ if (taskType == 1) {
//杩涚墖浠诲姟鏁版嵁
LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
- feedWrapper.eq(BigStorageCageDetails::getState, 1)
- .or()
- .eq(BigStorageCageDetails::getState, 2);
- List<BigStorageCageDetails> bigStorageCageDetailsList=baseMapper.selectList(feedWrapper);
- List<BigStorageCageFeedTask> bigStorageCageFeedTaskList=bigStorageCageFeedTaskMapper.selectList(null);
+ feedWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN);
+ List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);
+
+ LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>();
+ feedTaskWrapper
+ .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+ .isNotNull(BigStorageCageFeedTask::getTargetSlot);
+ List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper);
Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
.collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task));
-
- for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
+ Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator();
+ while (iterator.hasNext()) {
+ BigStorageCageDetails bigStorageCageDetails = iterator.next();
BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId());
bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
+ if (bigStorageCageDetails.getBigStorageCageFeedTask() == null) {
+ iterator.remove();
+ }
+ }
+ LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskNoTargetWrapper = new LambdaQueryWrapper<>();
+ feedTaskNoTargetWrapper
+ .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+ .isNull(BigStorageCageFeedTask::getTargetSlot);
+ List<BigStorageCageFeedTask> bigStorageCageFeedTaskNoTargetList = bigStorageCageFeedTaskMapper.selectList(feedTaskNoTargetWrapper);
+ for (BigStorageCageFeedTask bigStorageCageFeedTask : bigStorageCageFeedTaskNoTargetList
+ ) {
+ BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
+ LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>();
+ glassInfoWrapper.eq(GlassInfo::getGlassId, bigStorageCageFeedTask.getGlassId());
+ GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper);
+ BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
+ bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
+ bigStorageCageDetailsList.add(bigStorageCageDetails);
}
return bigStorageCageDetailsList;
- }else{
+ } else {
//鍑虹墖浠诲姟鏁版嵁
LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>();
- outWrapper.eq(BigStorageCageDetails::getState, 3)
- .or()
- .eq(BigStorageCageDetails::getState, 4);
- List<BigStorageCageDetails> bigStorageCageDetailsList=baseMapper.selectList(outWrapper);
- List<BigStorageCageOutTask> bigStorageCageOutTaskList=bigStorageCageOutTaskMapper.selectList(null);
+ outWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN);
+ List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper);
+
+ LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>();
+ outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS);
+ List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper);
Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream()
.collect(Collectors.toMap(BigStorageCageOutTask::getGlassId, task -> task));
@@ -81,37 +123,45 @@
BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
}
+ Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator();
+ while (iterator.hasNext()) {
+ BigStorageCageDetails bigStorageCageDetails = iterator.next();
+ BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
+ bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
+ if (bigStorageCageDetails.getBigStorageCageOutTask() == null) {
+ iterator.remove();
+ }
+ }
return bigStorageCageDetailsList;
}
-
}
/**
* 鍒ゆ柇褰撳墠鐜荤拑鏄惁鑳戒笂杞�
*/
@Override
- public double selectGetBoard(String plcFeedReqLine){
- double carWidth=5000;
+ public double selectGetBoard(String plcFeedReqLine) {
+ double carWidth = 5000;
LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
feedWrapper.eq(BigStorageCageDetails::getState, plcFeedReqLine);
- List<BigStorageCageDetails> bigStorageCageDetailsList=baseMapper.selectList(feedWrapper);
+ List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);
LambdaQueryWrapper<BigStorageCageFeedTask> bigStorageCageFeedTaskWrapper = new LambdaQueryWrapper<>();
bigStorageCageFeedTaskWrapper
- .eq(BigStorageCageFeedTask::getTaskState,plcFeedReqLine)
- .eq(BigStorageCageFeedTask::getLine,plcFeedReqLine);
+ .eq(BigStorageCageFeedTask::getTaskState, plcFeedReqLine)
+ .eq(BigStorageCageFeedTask::getLine, plcFeedReqLine);
- List<BigStorageCageFeedTask> bigStorageCageFeedTaskList=bigStorageCageFeedTaskMapper.selectList(bigStorageCageFeedTaskWrapper);
+ List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(bigStorageCageFeedTaskWrapper);
Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
.collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task));
for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId());
bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
}
- for (BigStorageCageDetails bigStorageCageDetails:bigStorageCageDetailsList
- ) {
- if(bigStorageCageDetails.getBigStorageCageFeedTask().getTaskState()==0){
- carWidth -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + bigStorageCageDetails.getGap();
+ for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
+ ) {
+ if (bigStorageCageDetails.getBigStorageCageFeedTask().getTaskState() == 0) {
+ carWidth = carWidth - bigStorageCageDetails.getWidth() - glassGap;
}
}
return carWidth;
@@ -121,29 +171,37 @@
//鏍撻櫎鍑虹墖浠诲姟.鏇存柊鏍煎瓙瀹藉害
@Override
- public void deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails){
+ public void deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
baseMapper.deleteById(bigStorageCageDetails.getId());
bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
}
//鐞嗙墖绗艰鎯呯牬鎹�
@Override
- public void damageBigStorageCageDetails(String glassId){
- LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper=new LambdaQueryWrapper<>();
- temperingGlassInfoWrapper.eq(TemperingGlassInfo::getGlassId,glassId);
- TemperingGlassInfo temperingGlassInfo=temperingGlassInfoMapper.selectOne(temperingGlassInfoWrapper);
+ public void damageBigStorageCageDetails(String glassId, int status) {
- LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper=new LambdaQueryWrapper<>();
- bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getGlassId,glassId);
- BigStorageCageDetails bigStorageCageDetails=baseMapper.selectOne(bigStorageCageDetailsWrapper);
+ LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper = new LambdaQueryWrapper<>();
+ temperingGlassInfoWrapper.eq(TemperingGlassInfo::getGlassId, glassId);
+ TemperingGlassInfo temperingGlassInfo = temperingGlassInfoMapper.selectOne(temperingGlassInfoWrapper);
- if(temperingGlassInfo.getState()==-2){
- temperingGlassInfoMapper.deleteById(temperingGlassInfo);
- }else{
- temperingGlassInfo.setState(5);
+ LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper<>();
+ bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getGlassId, glassId);
+ BigStorageCageDetails bigStorageCageDetails = baseMapper.selectOne(bigStorageCageDetailsWrapper);
+
+ if (temperingGlassInfo != null) {
+ if (status == 0) {
+ temperingGlassInfo.setState(Const.TEMPERING_DAMAGE);
+ } else {
+ temperingGlassInfo.setState(Const.TEMPERING_TAKE);
+ }
temperingGlassInfoMapper.updateById(temperingGlassInfo);
}
- baseMapper.deleteById(bigStorageCageDetails.getId());
+ if (status == 0) {
+ bigStorageCageDetails.setState(Const.GLASS_STATE_TAKE);
+ } else {
+ bigStorageCageDetails.setState(Const.GLASS_STATE_DAMAGE);
+ }
+ baseMapper.updateById(bigStorageCageDetails);
bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
//todo:鎻掑叆鐮存崯鏁版嵁
@@ -151,59 +209,110 @@
//鏌ヨ鐜荤拑淇℃伅
@Override
- public BigStorageCageDetails selectBigStorageCageDetails(String glassId){
- LambdaQueryWrapper<GlassInfo> glassInfoWrapper=new LambdaQueryWrapper<>();
- glassInfoWrapper.eq(GlassInfo::getGlassId,glassId);
- GlassInfo glassInfo=glassInfoMapper.selectOne(glassInfoWrapper);
- BigStorageCageDetails bigStorageCageDetails=new BigStorageCageDetails();
- BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
- bigStorageCageDetails.setState(0);
- bigStorageCageDetails.setGap(20);
- return bigStorageCageDetails;
+ public List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId) {
+ LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>();
+ glassInfoWrapper.eq(GlassInfo::getGlassId, glassId);
+ GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper);
+ BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
+ if (glassInfo != null) {
+ BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
+ bigStorageCageDetails.setState(1);
+ bigStorageCageDetails.setGap(glassGap);
+ }
+ List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
+ bigStorageCageDetailsList.add(bigStorageCageDetails);
+ return bigStorageCageDetailsList;
}
//鐞嗙墖绗艰鎯呮坊鍔�
@Override
- public void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails){
+ public void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetails.setState(100);
baseMapper.insert(bigStorageCageDetails);
bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
}
//鐞嗙墖绗艰鎯呭畬鎴�
@Override
- public void finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails){
- if(bigStorageCageDetails.getState()==1||bigStorageCageDetails.getState()==2){
- bigStorageCageDetails.setState(0);
- baseMapper.updateById(bigStorageCageDetails);
- bigStorageCageFeedTaskMapper.deleteById(bigStorageCageDetails.getBigStorageCageFeedTask().getId());
- }else{
- baseMapper.deleteById(bigStorageCageDetails.getId());
- bigStorageCageOutTaskMapper.deleteById(bigStorageCageDetails.getBigStorageCageOutTask().getId());
- }
-
+ public void finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+// if (bigStorageCageDetails.getBigStorageCageFeedTask() != null) {
+// bigStorageCageDetails.setState(Const.BIG_STORAGE_INSIDE);
+// baseMapper.updateById(bigStorageCageDetails);
+// } else {
+// bigStorageCageDetails.setState(Const.BIG_STORAGE_OUTSIDE);
+// baseMapper.updateById(bigStorageCageDetails);
+// bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
+// }
}
//鎵嬪姩鍑虹墖
@Override
- public void outBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails){
- LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper =new LambdaQueryWrapper<>();
- temperingGlassInfoWrapper
- .eq(TemperingGlassInfo::getGlassId,bigStorageCageDetails.getGlassId());
- TemperingGlassInfo temperingGlassInfo=temperingGlassInfoMapper.selectOne(temperingGlassInfoWrapper);
- if(temperingGlassInfo.getGlassId()==null){
- LambdaQueryWrapper<GlassInfo> glassInfoWrapper=new LambdaQueryWrapper<>();
- glassInfoWrapper
- .eq(GlassInfo::getGlassId,bigStorageCageDetails.getGlassId());
- GlassInfo glassInfo=glassInfoMapper.selectOne(glassInfoWrapper);
- TemperingGlassInfo temperingGlassInfo1=new TemperingGlassInfo();
- BeanUtils.copyProperties(glassInfo, temperingGlassInfo1);
+ public void outBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetails.setState(Const.GLASS_STATE_ARTIFICIAL);
+ baseMapper.updateById(bigStorageCageDetails);
+ }
- if(temperingGlassInfo.getTemperingLayoutId()!=null){
- temperingGlassInfo1.setState(-1);
- }else{
- temperingGlassInfo1.setState(-2);
- }
- temperingGlassInfoMapper.insert(temperingGlassInfo1);
+ @Override
+ public BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo) {
+ BigStorageDTO bigStorageDTO = null;
+ MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
+ .selectAll(BigStorageCage.class)
+ .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
+ .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
+ .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+ .gt(BigStorageCage::getRemainWidth, glassInfo.getWidth())
+ .last("limit 1");
+ if (glassInfo.getTemperingLayoutId() == 0) {
+ wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight());
+ } else {
+ wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
}
+ BigStorageCage bigStorageCage = bigStorageCageService.selectJoinOne(BigStorageCage.class, wrapper);
+ if (null != bigStorageCage) {
+ bigStorageDTO = new BigStorageDTO();
+ bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
+ bigStorageDTO.setSlot(bigStorageCage.getSlot());
+ return bigStorageDTO;
+ }
+ bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
+ .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
+ .eq(BigStorageCage::getRemainWidth, slotWidth)
+ .inSql(BigStorageCage::getDeviceId,
+ "select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
+ .last("limit 1"));
+ if (null != bigStorageCage) {
+ bigStorageDTO = new BigStorageDTO();
+ bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
+ bigStorageDTO.setSlot(bigStorageCage.getSlot());
+ return bigStorageDTO;
+ }
+ //todo:鑾峰彇鐜荤拑鐨勫帤搴︼細閲嶆柊閫夌瀛愰渶瑕佹寜鐓х瀛愬彲鏀剧幓鐠冨帤搴﹁繘琛岄�夋嫨
+ bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
+ .eq(BigStorageCage::getRemainWidth, slotWidth)
+ .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
+ .gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
+ .orderByAsc(BigStorageCage::getDeviceId)
+ .last("limit 1"));
+ Assert.isTrue(null != bigStorageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
+ bigStorageDTO = new BigStorageDTO();
+ bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
+ bigStorageDTO.setSlot(bigStorageCage.getSlot());
+ return bigStorageDTO;
+ }
+
+ @Override
+ public List<TemperingLayoutDTO> temperingIsAll() {
+ return baseMapper.temperingIsAll();
+ }
+
+
+ @Override
+ public TemperingLayoutDTO queryTemperingOccupySlot() {
+ return baseMapper.queryTemperingOccupySlot(minCount);
+ }
+
+ @Override
+ public List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId) {
+ return baseMapper.queryGlassMaxAndMin(engineerId, temperingLayoutId);
}
}
--
Gitblit v1.8.0