From 82f33e80d430bc655a3ad85f282192cd3d9ae2ac Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 15 十月 2025 23:33:36 +0800
Subject: [PATCH] 1、中空添加sd配置 2、中空新笼子逻辑调整
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 72 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 5 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 bb872a9..6c5695a 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
@@ -157,14 +157,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;
@@ -172,6 +175,12 @@
}
if (CollectionUtil.isEmpty(inTaskList)) {
log.info("褰撳墠澶ц溅鏃犺繘鐗囩幓鐠冿紝缁撴潫杩涚墖浠诲姟");
+ return;
+ }
+ //鐜荤拑鐘舵�佸瓨鍦ㄥ崸杞珛涓婄粨鏉�
+ List<BigStorageCageTask> unTaskList = inTaskList.stream().filter(e -> e.getTaskState() < 1).collect(Collectors.toList());
+ if (CollectionUtil.isNotEmpty(unTaskList)) {
+ log.info("瀛樺湪鏈笂杞︾殑鐜荤拑淇℃伅,鐜荤拑锛歿}", unTaskList);
return;
}
log.info("鑾峰彇浠诲姟鐨勭幓鐠僫d锛歿}", glassIdList);
@@ -450,6 +459,7 @@
//nothing
log.info("浜�/涓夌嚎绾跨┖闂茬姸鎬佽幏鍙栧紓甯�");
}
+
List<Integer> resultList = new ArrayList<>();
if (redisUtil.getCacheObject("priorityHollowSwitch")) {
resultList = TWO_LINE_FIRST;
@@ -501,6 +511,15 @@
.eq(HollowGlassQueueInfo::getState, Const.TEMPERING_NEW)
.orderByAsc(HollowGlassQueueInfo::getHollowSequence));
if (CollectionUtil.isNotEmpty(unFinishHollowQueueList)) {
+ HollowGlassQueueInfo queueInfo = unFinishHollowQueueList.get(0);
+ //鐩撮�氬彴鏈夌幓鐠冩椂灏嗕腑绌哄嚭鐗囬槦鍒椾腑瀵瑰簲鐜荤拑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 && details.getGlassId().equals(queueInfo.getGlassId())) {
+ queueInfo.setCell(THROUGH_SLOT);
+ unFinishHollowQueueList.get(0).setCell(THROUGH_SLOT);
+ }
log.info("鏈夋鍦ㄥ嚭鐗囩殑涓┖浠诲姟");
Integer isPair = unFinishHollowQueueList.get(0).getIsPair();
hollowOutGlassByIsPair(unFinishHollowQueueList, hollowGlassOutRelationInfo.getCell(), isPair, hollowGlassOutRelationInfo.getTotalLayer(), hollowGlassOutRelationInfo.getIsForce());
@@ -856,22 +875,57 @@
@Scheduled(fixedDelay = 1000)
public void inCarTask() {
//璇诲彇鍗忚鏁版嵁
- S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
- //姹囨姤瀛椾负1 鍚姩瀛椾负1鏄� 娓呴櫎鎵�鏈変换鍔′俊鎭�
- //鍚姩瀛楀拰姹囨姤瀛楁槸鍚﹀潎涓�0
+ S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
+ log.info("杩涚墖浠诲姟璇诲彇s7DataZKDLPOne:{}", s7DataZKDLPOne);
+ Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
+ if (!inkageEntity) {
+ log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
+ return;
+ }
+ if (StringUtils.isNotBlank(s7DataZKDLPOne.getId7())) {
+ //姹囨姤瀛椾负1 鍚姩瀛椾负1鏄� 娓呴櫎鎵�鏈変换鍔′俊鎭�
+ if (s7DataZKDLPOne.getId7().equals(s7DataZKDLPOne.getId1())) {
+ //todo:娓呯┖浠诲姟
+ S7DataZKDLPOne sendTask = new S7DataZKDLPOne();
+ sendTask.setFrom7(0);
+ sendTask.setId1("");
+ s7SerializerZKDLPOne.write(sendTask);
+ }
+ log.info("瀛樺湪浠诲姟锛岀粨鏉�");
+ return;
+ }
+ Integer requestEntity = s7DataZKDLPOne.getRequestMes();
+ if (1 != requestEntity) {
+ log.info("褰撳墠鏈敹鍒拌繘鐗囪姹傦紝缁撴潫杩涚墖浠诲姟");
+ return;
+ }
+ //鏈夎姹備俊鍙�
List<String> glassIdList = hollowGlassQueueInfoService.queryNeedInCarGlass();
if (CollectionUtil.isEmpty(glassIdList)) {
return;
}
+ int count = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
+ .eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .eq(HollowBigStorageCageDetails::getSlot, THROUGH_SLOT));
+ 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::getDeviceId, 6)
.in(HollowBigStorageCageDetails::getGlassId, glassIdList));
if (CollectionUtil.isEmpty(list)) {
return;
}
+ HollowBigStorageCageDetails details = list.get(0);
//todo:鐢熸垚杩涜繘鐗囧ぇ杞︿换鍔�
-
+ hollowBigStorageCageDetailsService.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>()
+ .set(HollowBigStorageCageDetails::getState, Const.RAW_GLASS_STATE_OUT)
+ .eq(HollowBigStorageCageDetails::getGlassId, details.getGlassId()));
+ S7DataZKDLPOne sendTask = new S7DataZKDLPOne();
+ sendTask.setFrom7(THROUGH_SLOT);
+ sendTask.setId7(details.getGlassId());
+ s7SerializerZKDLPOne.write(sendTask);
}
@@ -1046,6 +1100,14 @@
// Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
Integer glassGap = hollowGlassRelationInfoService.getGlassGapByThickness(list.get(0).getThickness());
for (T e : list) {
+ //鏍煎瓙涓虹浜斾釜绗煎瓙鏃朵笉娣诲姞鍑虹墖浠诲姟
+ HollowBigStorageCage hollowBigStorageCage = hollowBigStorageCageService.getOne(
+ new LambdaQueryWrapper<HollowBigStorageCage>()
+ .eq(HollowBigStorageCage::getSlot, e.getSlot())
+ );
+ if (hollowBigStorageCage.getDeviceId() == 6) {
+ break;
+ }
if (templist.size() >= outCarMaxSize || Math.max((int) e.getWidth(), (int) e.getHeight()) > remainWidth) {
break;
}
--
Gitblit v1.8.0