From f082c354556f7e8d533cf8fefa4fbe671cccc119 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 03 十二月 2024 11:30:47 +0800
Subject: [PATCH] 1、fixbug:中空进片都重新计算格子 2、新增强制出片功能 3、优化出片调度逻辑
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 126 +++++++++++++++++++++++++-----------------
1 files changed, 75 insertions(+), 51 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
index bbfea54..0c00efd 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
@@ -270,7 +270,7 @@
if (CollectionUtil.isNotEmpty(unFinishHollowQueueList)) {
log.info("鏈夋鍦ㄥ嚭鐗囩殑涓┖浠诲姟");
Integer isPair = unFinishHollowQueueList.get(0).getIsPair();
- hollowOutGlassByIsPair(unFinishHollowQueueList, hollowGlassOutRelationInfo.getCell(), isPair, hollowGlassOutRelationInfo.getTotalLayer());
+ hollowOutGlassByIsPair(unFinishHollowQueueList, hollowGlassOutRelationInfo.getCell(), isPair, hollowGlassOutRelationInfo.getTotalLayer(),hollowGlassOutRelationInfo.getIsForce());
Date endDate = new Date();
log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
return;
@@ -281,45 +281,63 @@
.eq(HollowGlassOutRelationInfo::getCell, hollowGlassOutRelationInfo.getCell())
.set(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_SUCCESS));
}
-
- if (redisUtil.getCacheObject("hollowSwitch")) {
- List<HollowGlassOutRelationInfo> HollowGlassOutRelationInfoList = hollowGlassOutRelationInfoService
- .list(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
- .eq(HollowGlassOutRelationInfo::getCell, cell)
- .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_NEW));
- for (HollowGlassOutRelationInfo e : HollowGlassOutRelationInfoList) {
- //涓┖浼樺厛锛氳幏鍙栫悊鐗囩 鐜荤拑灏忕墖 鐮存崯琛� 鏁伴噺 鍒ゆ柇绗煎唴鐗堝浘鏄惁鍒伴綈
- List<FlowCardGlassInfoDTO> flowCardGlassInfoDTO = hollowBigStorageCageDetailsService.hollowIsAll(e.getFlowCardId(), e.getTotalLayer(), Boolean.TRUE);
- if (CollectionUtil.isNotEmpty(flowCardGlassInfoDTO)) {
- //鐜荤拑鍒伴綈鍖呮嫭宸插嚭鐗囩殑
- //鍒伴綈锛屽皢鐜荤拑灏忕墖鏁版嵁瀛樺叆涓┖灏忕墖琛紝閫昏緫鐢熸垚鍑虹墖浠诲姟 缁撴潫
- for (FlowCardGlassInfoDTO item : flowCardGlassInfoDTO) {
- List<HollowBigStorageCageDetails> hollowBigStorageCageDetailsList = hollowBigStorageCageDetailsService.queryOutGlassList(item.getFlowCardId(), cell);
- int finalCell = cell;
- List<HollowGlassQueueInfo> hollowQueues = hollowBigStorageCageDetailsList.stream().map(queue -> {
- HollowGlassQueueInfo queueInfo = new HollowGlassQueueInfo();
- BeanUtils.copyProperties(queue, queueInfo);
- queueInfo.setState(Const.TEMPERING_NEW);
- queueInfo.setCell(finalCell);
- return queueInfo;
- }).collect(Collectors.toList());
- if (CollectionUtil.isNotEmpty(hollowQueues)) {
- hollowGlassQueueInfoService.saveBatch(hollowQueues);
- Integer isPair = hollowQueues.get(0).getIsPair();
- hollowOutGlassByIsPair(hollowQueues, cell, isPair, e.getTotalLayer());
- //灏嗕腑绌轰换鍔＄姸鎬佹敼涓哄紑濮�
- hollowGlassOutRelationInfoService.update(new LambdaUpdateWrapper<HollowGlassOutRelationInfo>()
- .eq(HollowGlassOutRelationInfo::getFlowCardId, e.getFlowCardId())
- .eq(HollowGlassOutRelationInfo::getCell, cell)
- .set(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START));
- Date endDate = new Date();
- log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
- return;
- }
- }
- }
- }
- }
+// if (redisUtil.getCacheObject("hollowSwitch")) {
+// List<HollowGlassOutRelationInfo> HollowGlassOutRelationInfoList = hollowGlassOutRelationInfoService
+// .list(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
+// .eq(HollowGlassOutRelationInfo::getCell, cell)
+// .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_NEW));
+// for (HollowGlassOutRelationInfo e : HollowGlassOutRelationInfoList) {
+// //涓┖浼樺厛锛氳幏鍙栫悊鐗囩 鐜荤拑灏忕墖 鐮存崯琛� 鏁伴噺 鍒ゆ柇绗煎唴鐗堝浘鏄惁鍒伴綈
+// List<FlowCardGlassInfoDTO> flowCardGlassInfoDTO = hollowBigStorageCageDetailsService.hollowIsAll(e.getFlowCardId(), e.getTotalLayer(), Boolean.TRUE);
+// if (CollectionUtil.isNotEmpty(flowCardGlassInfoDTO)) {
+// //鐜荤拑鍒伴綈鍖呮嫭宸插嚭鐗囩殑
+// //鍒伴綈锛屽皢鐜荤拑灏忕墖鏁版嵁瀛樺叆涓┖灏忕墖琛紝閫昏緫鐢熸垚鍑虹墖浠诲姟 缁撴潫
+// for (FlowCardGlassInfoDTO item : flowCardGlassInfoDTO) {
+// List<HollowBigStorageCageDetails> hollowBigStorageCageDetailsList = hollowBigStorageCageDetailsService.queryOutGlassList(item.getFlowCardId(), cell);
+// int finalCell = cell;
+// List<HollowGlassQueueInfo> hollowQueues = hollowBigStorageCageDetailsList.stream().map(queue -> {
+// HollowGlassQueueInfo queueInfo = new HollowGlassQueueInfo();
+// BeanUtils.copyProperties(queue, queueInfo);
+// queueInfo.setState(Const.TEMPERING_NEW);
+// queueInfo.setCell(finalCell);
+// return queueInfo;
+// }).collect(Collectors.toList());
+//
+// List<HollowBigStorageCageDetails> hollowBigStorageCageDetailsList = hollowBigStorageCageDetailsService.queryOutGlassList(flowCardId, cell);
+// int isPairCount = glassInfo.getTotalLayer() * e.getTotalLayer();
+// List<HollowGlassQueueInfo> hollowQueues = new ArrayList<>();
+// loop:
+// for (HollowBigStorageCageDetails queue : hollowBigStorageCageDetailsList) {
+// HollowGlassQueueInfo queueInfo = new HollowGlassQueueInfo();
+// BeanUtils.copyProperties(queue, queueInfo);
+// queueInfo.setState(Const.TEMPERING_NEW);
+// queueInfo.setCell(cell);
+// hollowQueues.add(queueInfo);
+// if (queue.getIsPair() == 1){
+// isPairCount -=1;
+// if (isPairCount == 0){
+// break loop;
+// }
+// }
+// }
+//
+// if (CollectionUtil.isNotEmpty(hollowQueues)) {
+// hollowGlassQueueInfoService.saveBatch(hollowQueues);
+// Integer isPair = hollowQueues.get(0).getIsPair();
+// hollowOutGlassByIsPair(hollowQueues, cell, isPair, e.getTotalLayer());
+// //灏嗕腑绌轰换鍔＄姸鎬佹敼涓哄紑濮�
+// hollowGlassOutRelationInfoService.update(new LambdaUpdateWrapper<HollowGlassOutRelationInfo>()
+// .eq(HollowGlassOutRelationInfo::getFlowCardId, e.getFlowCardId())
+// .eq(HollowGlassOutRelationInfo::getCell, cell)
+// .set(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START));
+// Date endDate = new Date();
+// log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
+// return;
+// }
+// }
+// }
+// }
+// }
}
// redisUtil.setCacheObject("dispatchHollowSwitch",true);
//鏄惁瀛樺湪闇�瑕佸唴閮ㄨ皟搴︾殑鏍煎瓙:鎵ц鍐呴儴璋冨害浠诲姟
@@ -345,7 +363,7 @@
int targetSlot = item.getSlot();
list = hollowBigStorageCageDetailsService.list(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
.eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN).eq(HollowBigStorageCageDetails::getSlot, startSlot));
- hollowOutGlassByIsPair(list, targetSlot, 0, 0);
+ hollowOutGlassByIsPair(list, targetSlot, 0, 0,1);
List<Integer> slotList = new ArrayList<>();
slotList.add(targetSlot);
updateSlotRemainBySlots(slotList);
@@ -534,8 +552,11 @@
// 绌烘墽琛�
}
}
+ //鏇存柊鏁伴噺
+// hollowGlassOutRelationInfoService.update
// 閲嶇疆浠诲姟琛ㄦ暟鎹�
bigStorageCageTaskService.updateOutTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
+
//娓呯┖鍚姩鐘舵��
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 0));
@@ -643,7 +664,7 @@
}
- private <T extends HollowBigStorageCageBaseInfo> Boolean hollowOutGlassByIsPair(List<T> list, int targetSlot, int isPair, int totalLayer) {
+ private <T extends HollowBigStorageCageBaseInfo> Boolean hollowOutGlassByIsPair(List<T> list, int targetSlot, int isPair, int totalLayer,int isForce) {
List<T> resultList = new ArrayList<>();
int taskType = Const.BIG_STORAGE_AFTER_OUT;
int taskState = Const.GLASS_STATE_OUT_ING;
@@ -652,12 +673,12 @@
resultList.add(t);
}
}
- if (isPair == 0) {
+ if (isPair == 0 && isForce!=1) {
taskType = Const.BIG_STORAGE_AFTER_DISPATCH;
taskState = Const.GLASS_STATE_SCHEDULE_ING;
totalLayer = 0;
}
- return computeOutGlassInfo(resultList, BIG_STORAGE_CAGE_OUT_TWO_TASK, targetSlot, taskState, taskType, totalLayer);
+ return computeOutGlassInfo(resultList, BIG_STORAGE_CAGE_OUT_TWO_TASK, targetSlot, taskState, taskType, totalLayer,isForce);
}
/**
@@ -668,7 +689,7 @@
* @param totalLayer
* @return
*/
- private <T extends HollowBigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list, String tableName, int targetSlot, int state, int taskType, int totalLayer) {
+ private <T extends HollowBigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list, String tableName, int targetSlot, int state, int taskType, int totalLayer,int isForce) {
//浠诲姟鏁版嵁:鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲�,鐜荤拑闂撮殧
List<BigStorageCageTask> tempList = new ArrayList<>();
List<T> tempTList = new ArrayList<>();
@@ -687,14 +708,17 @@
Assert.isFalse(CollectionUtil.isEmpty(tempList), "鏈幏鍙栧嚭鐗囨暟鎹紝缁撴潫鍑虹墖浠诲姟");
log.info("鑾峰彇鍑虹墖浠诲姟鏁版嵁{}鏉★紝鎵ц淇濆瓨", tempList.size());
List<BigStorageCageTask> bigStorageCageTaskList = tempList;
- if (taskType == Const.BIG_STORAGE_AFTER_OUT) {
- if (tempList.size() <= totalLayer) {
- bigStorageCageTaskList = tempList;
- } else {
- int remainCount = tempList.size() % totalLayer;
-// tempList.subList(0,)
+ if (1!= isForce){
+ if (taskType == Const.BIG_STORAGE_AFTER_OUT) {
+ if (tempList.size() <= totalLayer) {
+ bigStorageCageTaskList = tempList;
+ } else {
+ int remainCount = tempList.size() % totalLayer;
+ bigStorageCageTaskList = tempList.subList(0,tempList.size() - remainCount);
+ }
}
}
+
List<String> glassIds = bigStorageCageTaskList.stream().map(BigStorageCageTask::getGlassId).collect(Collectors.toList());
int glassCount = bigStorageCageTaskList.size();
//鐢熸垚鍑虹墖浠诲姟鏉℃暟涓嶈冻6琛ュ叏
--
Gitblit v1.8.0