From 9272ffcd882f7fceef00dc01dc08b75a1e3acd4c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 11 十一月 2025 15:09:34 +0800
Subject: [PATCH] 1、 中空出片任务调度任务判定，占用单格的不配对的不执行调度，格子内全部为不配对的不调度 2、 移除无用包引用
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java | 7 -------
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 46 +++++++++++++++++++++++++++++++++++++++-------
2 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
index 78e634c..c79c486 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
@@ -1,10 +1,6 @@
package com.mes.job;
-import com.github.xingshuangs.iot.common.buff.ByteReadBuff;
-import com.github.xingshuangs.iot.common.buff.EByteBuffFormat;
import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
-import com.github.xingshuangs.iot.utils.ByteUtil;
-import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.hollow.entity.vo.HollowGlassFormulaVO;
import com.mes.hollow.service.HollowFormulaDetailsService;
@@ -16,9 +12,6 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
/**
* @author SNG-015
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
index 81425cf..0fb1f76 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
@@ -532,11 +532,14 @@
.eq(HollowGlassQueueInfo::getState, Const.TEMPERING_NEW)
.eq(HollowGlassQueueInfo::getRelationId, hollowGlassOutRelationInfo.getId())
.orderByAsc(HollowGlassQueueInfo::getHollowSequence));
- if (CollectionUtil.isNotEmpty(unFinishHollowQueueList)) {
+ //鎸夌収浠诲姟淇℃伅杩囨护绛涢�夐渶瑕佸嚭鐗囧強璋冨害鐨勭幓鐠冮槦鍒�
+ List<HollowGlassQueueInfo> resultQueue = computeOutHollowQueue(unFinishHollowQueueList, hollowGlassOutRelationInfo);
+ log.info("涓┖鍑虹墖浠诲姟璁＄畻鍚庣殑鍑虹墖闃熷垪涓猴細{}", resultQueue);
+ if (CollectionUtil.isNotEmpty(resultQueue)) {
//鐩撮�氬彴鏈夌幓鐠冩椂灏嗕腑绌哄嚭鐗囬槦鍒椾腑瀵瑰簲鐜荤拑id鐨勬牸瀛愬彿鏇挎崲鏈洿閫氬彴
log.info("涓┖澶х悊鐗囩洿閫氬彴鐜荤拑淇℃伅{}", details);
if (details != null) {
- unFinishHollowQueueList.stream().forEach(e -> {
+ resultQueue.stream().forEach(e -> {
if (e.getGlassId().equals(details.getGlassId())) {
e.setSlot(THROUGH_SLOT);
e.setDeviceId(0);
@@ -544,11 +547,9 @@
}
});
}
-
- List<HollowGlassQueueInfo> infoList = unFinishHollowQueueList.stream().filter(e -> !(e.getSlot() >= 500 && e.getSlot() < 900 && e.getIsPair() != 1)).collect(Collectors.toList());
- log.info("鏈夋鍦ㄥ嚭鐗囩殑涓┖浠诲姟");
- Integer isPair = infoList.get(0).getIsPair();
- hollowOutGlassByIsPair(infoList, hollowGlassOutRelationInfo.getCell(), isPair, hollowGlassOutRelationInfo.getTotalLayer(), hollowGlassOutRelationInfo.getIsForce());
+ log.info("鏈夋鍦ㄥ嚭鐗囩殑涓┖浠诲姟:{}", hollowGlassOutRelationInfo);
+ Integer isPair = resultQueue.get(0).getIsPair();
+ hollowOutGlassByIsPair(resultQueue, hollowGlassOutRelationInfo.getCell(), isPair, hollowGlassOutRelationInfo.getTotalLayer(), hollowGlassOutRelationInfo.getIsForce());
Date endDate = new Date();
log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
return;
@@ -598,6 +599,7 @@
log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
return;
}
+
@Scheduled(fixedDelay = 1000)
public void finishInBigStorageTask() throws Exception {
@@ -1076,6 +1078,36 @@
log.info("鍑虹墖浠诲姟-鏃犲姩浣滄墽琛屽畬鎴�");
}
+ private List<HollowGlassQueueInfo> computeOutHollowQueue(List<HollowGlassQueueInfo> queueInfoList, HollowGlassOutRelationInfo hollowGlassOutRelationInfo) {
+ if (CollectionUtil.isNotEmpty(queueInfoList)) {
+ return new ArrayList<>();
+ }
+ //浠诲姟涓哄己鍒讹紝鍙洿鎺ヨ繑鍥炲師鏈夌殑闃熷垪
+ if (hollowGlassOutRelationInfo.getIsForce() == 1) {
+ return queueInfoList;
+ }
+ log.info("棰嗗彇浠诲姟锛歿}鐨勯槦鍒楋細{}", hollowGlassOutRelationInfo, queueInfoList);
+ // 鎸夋牸瀛愬彿鍒嗙粍
+ Map<Integer, List<HollowGlassQueueInfo>> gridGroups = queueInfoList.stream()
+ .collect(Collectors.groupingBy(HollowGlassQueueInfo::getSlot));
+ List<HollowGlassQueueInfo> resultQueue = new ArrayList<>();
+
+ for (List<HollowGlassQueueInfo> items : gridGroups.values()) {
+ // 鎯呭喌1锛氭牸瀛愬唴鍙湁涓�涓暟鎹笖鏈厤瀵� - 杩囨护鎺�
+ if (items.size() == 1 && 0 == items.get(0).getSlot()) {
+ continue;
+ }
+
+ // 鎯呭喌2锛氭牸瀛愬唴鍏ㄩ儴涓烘湭閰嶅鐨勬暟鎹� - 杩囨护鎺�
+ boolean allUnpaired = items.stream().noneMatch(e -> e.getIsPair() == 1);
+ if (allUnpaired) {
+ continue;
+ }
+ // 鍚﹀垯淇濈暀杩欎釜鏍煎瓙鍐呯殑鎵�鏈夋暟鎹�
+ resultQueue.addAll(items);
+ }
+ return resultQueue;
+ }
private <T extends HollowBigStorageCageBaseInfo> Boolean hollowOutGlassByIsPair(List<T> list,
int targetSlot, int isPair, int totalLayer, int isForce) throws Exception {
--
Gitblit v1.8.0