From b7533c1472fd129bdf19a99c5f8255b647a59b0e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 03 七月 2024 12:37:56 +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 | 124 ++++++++++++++++++++++-------------------
1 files changed, 66 insertions(+), 58 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 a001cfe..aa3f45e 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
@@ -26,6 +26,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -55,14 +56,8 @@
@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;
@@ -72,43 +67,43 @@
*/
@Override
public List<BigStorageCageDetails> selectTask(int taskType) {
-
- if (taskType == 1) {
- //杩涚墖浠诲姟鏁版嵁
- LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
- 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));
-
- for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
- BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId());
- bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
- }
- return bigStorageCageDetailsList;
- } else {
- //鍑虹墖浠诲姟鏁版嵁
- LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>();
- 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));
- for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
- BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
- bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
- }
- return bigStorageCageDetailsList;
- }
+ return null;
+// if (taskType == 1) {
+// //杩涚墖浠诲姟鏁版嵁
+// LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
+// 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));
+//
+// for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
+// BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId());
+// bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
+// }
+// return bigStorageCageDetailsList;
+// } else {
+// //鍑虹墖浠诲姟鏁版嵁
+// LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>();
+// 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));
+// for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
+// BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
+// bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
+// }
+// return bigStorageCageDetailsList;
+// }
}
/**
@@ -171,7 +166,12 @@
}
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:鎻掑叆鐮存崯鏁版嵁
@@ -179,20 +179,25 @@
//鏌ヨ鐜荤拑淇℃伅
@Override
- public BigStorageCageDetails selectBigStorageCageDetails(String glassId) {
+ 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();
- BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
- bigStorageCageDetails.setState(0);
- bigStorageCageDetails.setGap(galssGap);
- return bigStorageCageDetails;
+ if (glassInfo != null) {
+ BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
+ bigStorageCageDetails.setState(1);
+ bigStorageCageDetails.setGap(galssGap);
+ }
+ List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
+ bigStorageCageDetailsList.add(bigStorageCageDetails);
+ return bigStorageCageDetailsList;
}
//鐞嗙墖绗艰鎯呮坊鍔�
@Override
public void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
+ bigStorageCageDetails.setState(100);
baseMapper.insert(bigStorageCageDetails);
bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
}
@@ -200,20 +205,20 @@
//鐞嗙墖绗艰鎯呭畬鎴�
@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());
- }
+// 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);
+ bigStorageCageDetails.setState(Const.GLASS_STATE_ARTIFICIAL);
baseMapper.updateById(bigStorageCageDetails);
}
@@ -223,6 +228,7 @@
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");
@@ -239,6 +245,7 @@
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())
@@ -251,6 +258,7 @@
}
bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
.eq(BigStorageCage::getRemainWidth, slotWidth)
+ .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
.last("limit 1"));
Assert.isTrue(null != bigStorageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
bigStorageDTO = new BigStorageDTO();
--
Gitblit v1.8.0