From 3af375d6963531c403668f9fb507ae30d741a99f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 01 八月 2024 11:16:32 +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 | 65 ++++++++++----------------------
1 files changed, 20 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 6761928..588bc3e 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
@@ -87,56 +87,34 @@
private boolean sequenceOrder;
- /**
- * 鏌ヨ杩�/鍑虹墖浠诲姟
- */
@Override
- public List<BigStorageCageDetails> selectTask(int taskType) {
- if (taskType == 1) {
- //杩涚墖浠诲姟鏁版嵁
- LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
- feedWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN);
- List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);
+ public List<BigStorageCageDetails> selectFeedTask(){
+ //杩涚墖浠诲姟鏁版嵁
+ LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
+ feedWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_NEW);
+ 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));
+ 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));
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 {
- //鍑虹墖浠诲姟鏁版嵁
- LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>();
- outWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN);
- List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper);
+ }
+ @Override
+ public List<BigStorageCageDetails> selectOutTask(){
+ LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>();
+ outWrapper.in(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING,Const.GLASS_STATE_SCHEDULE_ING);
+ 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);
@@ -152,13 +130,10 @@
BigStorageCageDetails bigStorageCageDetails = iterator.next();
BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
- if (bigStorageCageDetails.getBigStorageCageOutTask() == null) {
- iterator.remove();
- }
}
return bigStorageCageDetailsList;
}
- }
+
/**
* 鍒ゆ柇褰撳墠鐜荤拑鏄惁鑳戒笂杞�
@@ -361,7 +336,7 @@
@Override
- public TemperingLayoutDTO queryTemperingOccupySlot() {
+ public List<TemperingLayoutDTO> queryTemperingOccupySlot() {
return baseMapper.queryTemperingOccupySlot(minCount);
}
--
Gitblit v1.8.0