From 3123dbd3a5be75999f368fbe4aa722e3877074ab Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 14 六月 2024 15:52:28 +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 | 137 ++++++++++++++++++++++++++++++---------------
1 files changed, 92 insertions(+), 45 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..ebaec10 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,12 @@
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.mapper.BigStorageCageDetailsMapper;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
@@ -10,6 +14,7 @@
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;
@@ -49,14 +54,14 @@
*/
@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);
+ List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);
+ List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(null);
Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
.collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task));
@@ -66,14 +71,14 @@
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);
+ List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper);
+ List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(null);
Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream()
.collect(Collectors.toMap(BigStorageCageOutTask::getGlassId, task -> task));
@@ -90,27 +95,27 @@
* 鍒ゆ柇褰撳墠鐜荤拑鏄惁鑳戒笂杞�
*/
@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){
+ for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
+ ) {
+ if (bigStorageCageDetails.getBigStorageCageFeedTask().getTaskState() == 0) {
carWidth -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + bigStorageCageDetails.getGap();
}
}
@@ -121,25 +126,25 @@
//鏍撻櫎鍑虹墖浠诲姟.鏇存柊鏍煎瓙瀹藉害
@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) {
+ 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);
+ LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper<>();
+ bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getGlassId, glassId);
+ BigStorageCageDetails bigStorageCageDetails = baseMapper.selectOne(bigStorageCageDetailsWrapper);
- if(temperingGlassInfo.getState()==-2){
+ if (temperingGlassInfo.getState() == -2) {
temperingGlassInfoMapper.deleteById(temperingGlassInfo);
- }else{
+ } else {
temperingGlassInfo.setState(5);
temperingGlassInfoMapper.updateById(temperingGlassInfo);
}
@@ -151,11 +156,11 @@
//鏌ヨ鐜荤拑淇℃伅
@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();
+ 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);
@@ -164,19 +169,19 @@
//鐞嗙墖绗艰鎯呮坊鍔�
@Override
- public void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails){
+ public void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
baseMapper.insert(bigStorageCageDetails);
bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
}
//鐞嗙墖绗艰鎯呭畬鎴�
@Override
- public void finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails){
- if(bigStorageCageDetails.getState()==1||bigStorageCageDetails.getState()==2){
+ public void finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+ if (bigStorageCageDetails.getState() == 1 || bigStorageCageDetails.getState() == 2) {
bigStorageCageDetails.setState(0);
baseMapper.updateById(bigStorageCageDetails);
bigStorageCageFeedTaskMapper.deleteById(bigStorageCageDetails.getBigStorageCageFeedTask().getId());
- }else{
+ } else {
baseMapper.deleteById(bigStorageCageDetails.getId());
bigStorageCageOutTaskMapper.deleteById(bigStorageCageDetails.getBigStorageCageOutTask().getId());
}
@@ -185,25 +190,67 @@
//鎵嬪姩鍑虹墖
@Override
- public void outBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails){
- LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper =new LambdaQueryWrapper<>();
+ 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<>();
+ .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();
+ .eq(GlassInfo::getGlassId, bigStorageCageDetails.getGlassId());
+ GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper);
+ TemperingGlassInfo temperingGlassInfo1 = new TemperingGlassInfo();
BeanUtils.copyProperties(glassInfo, temperingGlassInfo1);
- if(temperingGlassInfo.getTemperingLayoutId()!=null){
+ if (temperingGlassInfo.getTemperingLayoutId() != null) {
temperingGlassInfo1.setState(-1);
- }else{
+ } else {
temperingGlassInfo1.setState(-2);
}
temperingGlassInfoMapper.insert(temperingGlassInfo1);
}
}
+
+ @Override
+ public BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo) {
+// MPJLambdaWrapper<BigStorageDTO> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
+// .selectAll(BigStorageDTO.class)
+// .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
+// .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+// .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1)
+// .last("limit 1");
+ BigStorageDTO bigStorageDTO = null;
+ MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
+ .selectAsClass(BigStorageCage.class, BigStorageDTO.class)
+ .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
+ .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+ .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1)
+ .last("limit 1");
+ bigStorageDTO = bigStorageCageService.selectJoinOne(BigStorageDTO.class, wrapper);
+ if (null != bigStorageDTO) {
+ return bigStorageDTO;
+ }
+ BigStorageCage bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
+ .eq(BigStorageCage::getRemainWidth, Const.BIG_STORAGE_WIDTH)
+ .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, Const.BIG_STORAGE_WIDTH)
+ .last("limit 1"));
+ Assert.isTrue(null != bigStorageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
+ bigStorageDTO = new BigStorageDTO();
+ bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
+ bigStorageDTO.setSlot(bigStorageCage.getSlot());
+ return bigStorageDTO;
+
+
+ }
}
--
Gitblit v1.8.0