From c823892f961b266199731ddd365d2dd4af4bf382 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 03 十二月 2024 08:50:27 +0800
Subject: [PATCH] 1、中空线初步版本，待优化 2、fixbug 钢化后摆片顺序错乱
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java | 44 +++-----------------------------------------
1 files changed, 3 insertions(+), 41 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java
index e7354e6..0c41e55 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java
@@ -34,19 +34,13 @@
HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService;
@Override
- public void forceOutGlass(String flowCardId, int cell) {
- hollowGlassOutRelationInfoService.receiveTask(flowCardId, cell);
+ public void forceOutGlass(String flowCardId, int cell, int totalPairQuantity) {
+ hollowGlassOutRelationInfoService.receiveTask(flowCardId, cell, totalPairQuantity);
hollowGlassOutRelationInfoService.update(new LambdaUpdateWrapper<HollowGlassOutRelationInfo>()
.eq(HollowGlassOutRelationInfo::getFlowCardId, flowCardId)
.set(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
);
- List<HollowBigStorageCageDetails> hollowBigStorageCageDetailsList = hollowBigStorageCageDetailsService.list(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
- .eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
- .eq(HollowBigStorageCageDetails::getFlowCardId, flowCardId)
- .orderByAsc(HollowBigStorageCageDetails::getVirtualSlot)
- .orderBy(Boolean.TRUE, cell != 931, HollowBigStorageCageDetails::getSequence)
- .orderByAsc(HollowBigStorageCageDetails::getHollowSequence)
- );
+ List<HollowBigStorageCageDetails> hollowBigStorageCageDetailsList = hollowBigStorageCageDetailsService.queryOutGlassList(flowCardId, cell);
List<HollowGlassQueueInfo> hollowQueues = hollowBigStorageCageDetailsList.stream().map(queue -> {
HollowGlassQueueInfo queueInfo = new HollowGlassQueueInfo();
@@ -57,38 +51,6 @@
}).collect(Collectors.toList());
this.saveBatch(hollowQueues);
}
-
- @Override
- public void changeForceOutGlass(String flowCardId, int cell) {
- hollowGlassOutRelationInfoService.update(new LambdaUpdateWrapper<HollowGlassOutRelationInfo>()
- .eq(HollowGlassOutRelationInfo::getFlowCardId, flowCardId)
- .set(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
- );
- //鎯呭喌鍘嗗彶浠诲姟涓湭鍋氬畬鐨勭幓鐠冧俊鎭�
- this.remove(new LambdaQueryWrapper<HollowGlassQueueInfo>()
- .eq(HollowGlassQueueInfo::getFlowCardId, flowCardId)
- .eq(HollowGlassQueueInfo::getCell, cell)
- .eq(HollowGlassQueueInfo::getState, Const.TEMPERING_NEW)
- );
- //鎸夌収绾胯矾閲嶆柊鍘荤悊鐗囩鏌ヨ鐜荤拑淇℃伅
- List<HollowBigStorageCageDetails> hollowBigStorageCageDetailsList = hollowBigStorageCageDetailsService.list(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
- .eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
- .eq(HollowBigStorageCageDetails::getFlowCardId, flowCardId)
- .orderByAsc(HollowBigStorageCageDetails::getVirtualSlot)
- .orderBy(Boolean.TRUE, cell != 931, HollowBigStorageCageDetails::getSequence)
- .orderByAsc(HollowBigStorageCageDetails::getHollowSequence)
- );
-
- List<HollowGlassQueueInfo> hollowQueues = hollowBigStorageCageDetailsList.stream().map(queue -> {
- HollowGlassQueueInfo queueInfo = new HollowGlassQueueInfo();
- BeanUtils.copyProperties(queue, queueInfo);
- queueInfo.setState(Const.TEMPERING_NEW);
- queueInfo.setCell(cell);
- return queueInfo;
- }).collect(Collectors.toList());
- this.saveBatch(hollowQueues);
- }
-
@Override
public List<HollowGlassQueueInfo> queryHollowGlassQueueInfo(int cell) {
HollowGlassOutRelationInfo one = hollowGlassOutRelationInfoService.getOne(new LambdaUpdateWrapper<HollowGlassOutRelationInfo>()
--
Gitblit v1.8.0