From 09a010c5dc11c68a866a6075a74bd1bbefb4a9a8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 24 六月 2024 16:38:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 226 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 196 insertions(+), 30 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 89a9109..c3a9c9c 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,18 +1,28 @@
package com.mes.bigstorage.service.impl;
+import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.mapper.BigStorageCageMapper;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
+import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
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 org.springframework.beans.factory.annotation.Autowired;
+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;
@@ -29,26 +39,49 @@
* @since 2024-03-27
*/
@Service
-public class BigStorageCageDetailsServiceImpl extends ServiceImpl<BigStorageCageDetailsMapper, BigStorageCageDetails> implements BigStorageCageDetailsService {
+public class BigStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<BigStorageCageDetailsMapper, BigStorageCageDetails> implements BigStorageCageDetailsService {
@Resource
private BigStorageCageOutTaskMapper bigStorageCageOutTaskMapper;
@Resource
private BigStorageCageFeedTaskMapper bigStorageCageFeedTaskMapper;
+ @Resource
+ private TemperingGlassInfoMapper temperingGlassInfoMapper;
+ @Resource
+ private BigStorageCageService bigStorageCageService;
+ @Resource
+ private GlassInfoMapper glassInfoMapper;
+
+ @Value("${mes.minCount}")
+ private int minCount;
+
+ @Value("${mes.carWidth}")
+ private Integer carWidth;
+
+ @Value("${mes.slotWidth}")
+ private Integer slotWidth;
+
+ @Value("${mes.carMaxSize}")
+ private Integer carMaxSize;
+
+ @Value("${mes.galssGap}")
+ private Integer galssGap;
/**
* 鏌ヨ杩�/鍑虹墖浠诲姟
*/
@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.BIG_STORAGE_IN);
+ List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);
+
+ LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>();
+ feedTaskWrapper.lt(BigStorageCageFeedTask::getTaskState,Const.BIG_STORAGE_IN_SLOT);
+ List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper);
Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
.collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task));
@@ -58,14 +91,15 @@
bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
}
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.BIG_STORAGE_OUT);
+ 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));
@@ -75,37 +109,169 @@
}
return bigStorageCageDetailsList;
}
-
}
/**
* 鍒ゆ柇褰撳墠鐜荤拑鏄惁鑳戒笂杞�
*/
@Override
- public boolean selectGetBoard(GlassInfo glassInfo, 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);
- List<BigStorageCageFeedTask> bigStorageCageFeedTaskList=bigStorageCageFeedTaskMapper.selectList(null);
+ LambdaQueryWrapper<BigStorageCageFeedTask> bigStorageCageFeedTaskWrapper = new LambdaQueryWrapper<>();
+ bigStorageCageFeedTaskWrapper
+ .eq(BigStorageCageFeedTask::getTaskState, plcFeedReqLine)
+ .eq(BigStorageCageFeedTask::getLine, plcFeedReqLine);
+
+ 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 -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + galssGap;
}
}
- if(carWidth>=0){
- return true;
- }else{
- return false;
- }
+ return carWidth;
}
+
+
+ //鏍撻櫎鍑虹墖浠诲姟.鏇存柊鏍煎瓙瀹藉害
+ @Override
+ public void deleteBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+ baseMapper.deleteById(bigStorageCageDetails.getId());
+ bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
+ }
+
+ //鐞嗙墖绗艰鎯呯牬鎹�
+ @Override
+ public void damageBigStorageCageDetails(String glassId,int status) {
+
+ LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper = new LambdaQueryWrapper<>();
+ temperingGlassInfoWrapper.eq(TemperingGlassInfo::getGlassId, glassId);
+ TemperingGlassInfo temperingGlassInfo = temperingGlassInfoMapper.selectOne(temperingGlassInfoWrapper);
+
+ 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());
+ bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
+ //todo:鎻掑叆鐮存崯鏁版嵁
+
+ }
+
+ //鏌ヨ鐜荤拑淇℃伅
+ @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(galssGap);
+ return bigStorageCageDetails;
+ }
+
+ //鐞嗙墖绗艰鎯呮坊鍔�
+ @Override
+ public void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+ baseMapper.insert(bigStorageCageDetails);
+ bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
+ }
+
+ //鐞嗙墖绗艰鎯呭畬鎴�
+ @Override
+ 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) {
+ bigStorageCageDetails.setState(4);
+ baseMapper.updateById(bigStorageCageDetails);
+ }
+
+ @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(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::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;
+ }
+ bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
+ .eq(BigStorageCage::getRemainWidth, slotWidth)
+ .last("limit 1"));
+ Assert.isTrue(null != bigStorageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
+ bigStorageDTO = new BigStorageDTO();
+ bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
+ bigStorageDTO.setSlot(bigStorageCage.getSlot());
+ return bigStorageDTO;
+ }
+
+ @Override
+ public 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