From 254a14ae35039bf52186f0e1dad24baa0b130b83 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 11 十一月 2025 15:15:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 148 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 129 insertions(+), 19 deletions(-)
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 78670a0..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
@@ -117,6 +117,8 @@
private static final String ALARM_TYPE = "涓┖澶х悊鐗�";
private static final String ALARM_CODE_SIZE = "sizeSame";
private static final String ALARM_CODE_ID = "idSame";
+ private static final String ALARM_CODE_SLOT = "slotLess";
+ private static final String ALARM_CODE_OVER = "overSize";
/**
* 鐩撮�氭牸瀛�
@@ -157,14 +159,17 @@
List<BigStorageCageTask> inTaskList = new ArrayList();
Integer from = s7DataZKDLPOne.getFrom1();
+ List<Integer> states = s7DataZKDLPOne.getStates();
List<String> glassIdList = new ArrayList<>();
List<String> requestWords = s7DataZKDLPOne.getIds();
for (int i = 1; i <= 6; i++) {
String requestWord = requestWords.get(i - 1);
+ Integer state = states.get(i - 1);
if (null != requestWord && !requestWord.isEmpty()) {
BigStorageCageTask task = new BigStorageCageTask();
task.setGlassId(requestWord);
task.setStartSlot(from);
+ task.setTaskState(state);
inTaskList.add(task);
glassIdList.add(requestWord);
continue;
@@ -242,6 +247,13 @@
.ge(HollowBigStorageCage::getMaxThickness, entry.getKey()));
if (count < entry.getValue()) {
log.info("绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻锛岀粨鏉熸湰娆¤繘鐗�");
+ ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
+ alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
+ alarmInfo.setAlarmModule(ALARM_MODULE);
+ alarmInfo.setAlarmType(ALARM_TYPE);
+ alarmInfo.setAlarmCode(ALARM_CODE_SLOT);
+ alarmInfo.setAlarmMessage(count + "");
+ productAlarmInfoService.save(alarmInfo);
//鍚憄lc鍙戦�佹姤璀�:绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻
s7DataZKDLPOne = new S7DataZKDLPOne();
s7DataZKDLPOne.setAlramSignal(16);
@@ -456,6 +468,7 @@
//nothing
log.info("浜�/涓夌嚎绾跨┖闂茬姸鎬佽幏鍙栧紓甯�");
}
+
List<Integer> resultList = new ArrayList<>();
if (redisUtil.getCacheObject("priorityHollowSwitch")) {
resultList = TWO_LINE_FIRST;
@@ -464,6 +477,20 @@
}
HollowGlassOutRelationInfo hollowGlassOutRelationInfo = null;
+
+ //鐩撮�氬彴鏈夌幓鐠冩椂灏嗕腑绌哄嚭鐗囬槦鍒椾腑瀵瑰簲鐜荤拑id鐨勬牸瀛愬彿鏇挎崲鏈洿閫氬彴
+ HollowBigStorageCageDetails details = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
+ .eq(HollowBigStorageCageDetails::getSlot, THROUGH_SLOT)
+ .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL).last("limit 1"));
+ if (details != null) {
+ hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.getOne(
+ new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
+ .eq(HollowGlassOutRelationInfo::getFlowCardId, details.getFlowCardId())
+ .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
+ .orderByAsc(HollowGlassOutRelationInfo::getId)
+ .last("limit 1")
+ );
+ }
int cell = -1;
for (Integer i : resultList) {
if (null == hollowGlassOutRelationInfo) {
@@ -502,14 +529,27 @@
//鏄惁鏈夋鍦ㄤ腑绌虹殑鐜荤拑:涓┖灏忕墖琛ㄧ瓫閫夋湭鍑虹鐨勭幓鐠冧俊鎭�
// 鑾峰彇褰撳墠涓┖浠诲姟鏈畬鎴愬嚭鐗囩殑鐜荤拑淇℃伅
List<HollowGlassQueueInfo> unFinishHollowQueueList = hollowGlassQueueInfoService.list(new LambdaQueryWrapper<HollowGlassQueueInfo>()
- .eq(HollowGlassQueueInfo::getFlowCardId, hollowGlassOutRelationInfo.getFlowCardId())
- .eq(HollowGlassQueueInfo::getCell, hollowGlassOutRelationInfo.getCell())
.eq(HollowGlassQueueInfo::getState, Const.TEMPERING_NEW)
+ .eq(HollowGlassQueueInfo::getRelationId, hollowGlassOutRelationInfo.getId())
.orderByAsc(HollowGlassQueueInfo::getHollowSequence));
- if (CollectionUtil.isNotEmpty(unFinishHollowQueueList)) {
- log.info("鏈夋鍦ㄥ嚭鐗囩殑涓┖浠诲姟");
- Integer isPair = unFinishHollowQueueList.get(0).getIsPair();
- hollowOutGlassByIsPair(unFinishHollowQueueList, hollowGlassOutRelationInfo.getCell(), isPair, hollowGlassOutRelationInfo.getTotalLayer(), hollowGlassOutRelationInfo.getIsForce());
+ //鎸夌収浠诲姟淇℃伅杩囨护绛涢�夐渶瑕佸嚭鐗囧強璋冨害鐨勭幓鐠冮槦鍒�
+ List<HollowGlassQueueInfo> resultQueue = computeOutHollowQueue(unFinishHollowQueueList, hollowGlassOutRelationInfo);
+ log.info("涓┖鍑虹墖浠诲姟璁＄畻鍚庣殑鍑虹墖闃熷垪涓猴細{}", resultQueue);
+ if (CollectionUtil.isNotEmpty(resultQueue)) {
+ //鐩撮�氬彴鏈夌幓鐠冩椂灏嗕腑绌哄嚭鐗囬槦鍒椾腑瀵瑰簲鐜荤拑id鐨勬牸瀛愬彿鏇挎崲鏈洿閫氬彴
+ log.info("涓┖澶х悊鐗囩洿閫氬彴鐜荤拑淇℃伅{}", details);
+ if (details != null) {
+ resultQueue.stream().forEach(e -> {
+ if (e.getGlassId().equals(details.getGlassId())) {
+ e.setSlot(THROUGH_SLOT);
+ e.setDeviceId(0);
+ log.info("灏嗕腑绌洪槦鍒椾腑鐨勬牸瀛愬彿鏇挎崲涓虹洿閫氬彴{}", e);
+ }
+ });
+ }
+ 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;
@@ -559,6 +599,7 @@
log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
return;
}
+
@Scheduled(fixedDelay = 1000)
public void finishInBigStorageTask() throws Exception {
@@ -869,19 +910,32 @@
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
- if (StringUtils.isNotBlank(s7DataZKDLPOne.getId1())) {
+ Integer requestEntity = s7DataZKDLPOne.getRequestMes();
+ if (StringUtils.isNotBlank(s7DataZKDLPOne.getId7()) && requestEntity == 0) {
//姹囨姤瀛椾负1 鍚姩瀛椾负1鏄� 娓呴櫎鎵�鏈変换鍔′俊鎭�
- if (s7DataZKDLPOne.getId1().equals(s7DataZKDLPOne.getId1())) {
+ if (s7DataZKDLPOne.getId7().equals(s7DataZKDLPOne.getId1())) {
//todo:娓呯┖浠诲姟
- s7DataZKDLPOne.setFrom1(0);
- s7DataZKDLPOne.getId1();
+ S7DataZKDLPOne sendTask = new S7DataZKDLPOne();
+ sendTask.setFrom7(0);
+ sendTask.setId7("");
+ s7SerializerZKDLPOne.write(sendTask);
+ log.info("娓呴櫎鎵�鏈変换鍔′俊鎭瘂}", sendTask);
+ s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
+ log.info("娓呯┖浠诲姟鍚庡啀璇诲彇{}", s7DataZKDLPOne);
}
log.info("瀛樺湪浠诲姟锛岀粨鏉�");
return;
}
- Integer requestEntity = s7DataZKDLPOne.getRequestMes();
if (1 != requestEntity) {
log.info("褰撳墠鏈敹鍒拌繘鐗囪姹傦紝缁撴潫杩涚墖浠诲姟");
+ return;
+ }
+ if (StringUtils.isNotBlank(s7DataZKDLPOne.getId1())) {
+ log.info("褰撳墠瀛樺湪杩涚墖浠诲姟锛岀粨鏉�");
+ return;
+ }
+ if (StringUtils.isNotBlank(s7DataZKDLPOne.getId1())) {
+ log.info("褰撳墠瀛樺湪杩涚墖浠诲姟璇锋眰锛岀粨鏉熸湰娆″ぇ绗煎瓙璋冨害");
return;
}
//鏈夎姹備俊鍙�
@@ -892,22 +946,34 @@
int count = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
.eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
.eq(HollowBigStorageCageDetails::getSlot, THROUGH_SLOT));
+ log.info("鐩撮�氱墖鍙扮殑浠诲姟鏁伴噺涓猴細{}", count);
if (count > 0) {
return;
}
- List<HollowBigStorageCageDetails> list = hollowBigStorageCageDetailsService.list(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
- .eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
- .in(HollowBigStorageCageDetails::getDeviceId, 5)
- .in(HollowBigStorageCageDetails::getGlassId, glassIdList));
- if (CollectionUtil.isEmpty(list)) {
+ HollowBigStorageCageDetails details = null;
+ for (String glassId : glassIdList) {
+ details = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
+ .eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .eq(HollowBigStorageCageDetails::getGlassId, glassId).last("limit 1"));
+ log.info("鑾峰彇璋冨害浠诲姟锛歿}", details);
+ if (details != null) {
+ break;
+ }
+ }
+ if (details == null) {
return;
}
- HollowBigStorageCageDetails details = list.get(0);
- //todo:鐢熸垚杩涜繘鐗囧ぇ杞︿换鍔�
+ log.info("鑾峰彇闇�瑕佽皟搴︾殑鍗曟潯浠诲姟锛歿}", details);
+ //鐢熸垚杩涜繘鐗囧ぇ杞︿换鍔�
hollowBigStorageCageDetailsService.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>()
.set(HollowBigStorageCageDetails::getState, Const.RAW_GLASS_STATE_OUT)
.eq(HollowBigStorageCageDetails::getGlassId, details.getGlassId()));
-
+ S7DataZKDLPOne sendTask = new S7DataZKDLPOne();
+ sendTask.setFrom7(details.getSlot());
+ sendTask.setId7(details.getGlassId());
+ s7SerializerZKDLPOne.write(sendTask);
+ log.info("鏂扮瀛愬啓鍏d涓巉rom{}", sendTask);
+ updateSlotRemainBySlots(Arrays.asList(details.getSlot()));
}
@@ -1012,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 {
@@ -1048,6 +1144,13 @@
S7DataZKDLPOne s7DataZKDLPOne = new S7DataZKDLPOne();
s7DataZKDLPOne.setAlramSignal(16);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
+ ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
+ alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
+ alarmInfo.setAlarmModule(ALARM_MODULE);
+ alarmInfo.setAlarmType(ALARM_TYPE);
+ alarmInfo.setAlarmCode(ALARM_CODE_SLOT);
+ alarmInfo.setAlarmMessage("");
+ productAlarmInfoService.save(alarmInfo);
Assert.isFalse(storageCage == null, "浠诲姟璋冨害娌℃湁澶氫綑鏍煎瓙锛岀粨鏉熻皟搴︿换鍔�");
}
@@ -1081,6 +1184,7 @@
Integer outCarMaxSize = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_OUT_CAR_SIZE);
// Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
Integer glassGap = hollowGlassRelationInfoService.getGlassGapByThickness(list.get(0).getThickness());
+ log.info("涓┖鐢熸垚涓�杞︿换鍔★細{}", list);
for (T e : list) {
if (templist.size() >= outCarMaxSize || Math.max((int) e.getWidth(), (int) e.getHeight()) > remainWidth) {
break;
@@ -1133,6 +1237,12 @@
for (T t : baseInfoList) {
bigStorageCageTaskList.add(new BigStorageCageTask(t.getGlassId(), t.getSlot(), targetSlot, 0));
}
+
+ List<BigStorageCageTask> tasks = bigStorageCageTaskList.stream().filter(e -> e.getStartSlot() >= 500 && e.getStartSlot() < 900).collect(Collectors.toList());
+ if (CollectionUtil.isNotEmpty(tasks)) {
+ log.info("褰撳墠鍑虹墖闃熷垪瀛樺湪鏂扮瀛愮殑鐜荤拑灏忕墖锛岀粨鏉熸湰娆′换鍔★細{}", tasks);
+ return false;
+ }
//娓呯┖浠诲姟琛ㄦ暟鎹�
resetOutTask();
log.info("鐢熸垚鍑虹墖浠诲姟鏁版嵁{}", bigStorageCageTaskList);
--
Gitblit v1.8.0