From 9d961999ca32c97c31174179dd7bc763c245d7f6 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 15 十月 2025 16:47:03 +0800
Subject: [PATCH] 1、 最终方案:新增db地址,mes将玻璃信息写入地址
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 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..78670a0 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
@@ -174,6 +174,12 @@
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);
Map<String, Long> glassCountMap = glassIdList.stream().collect(Collectors.groupingBy(e -> e, Collectors.counting()));
for (Map.Entry<String, Long> entry : glassCountMap.entrySet()) {
@@ -856,11 +862,37 @@
@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.getId1())) {
+ //姹囨姤瀛椾负1 鍚姩瀛椾负1鏄� 娓呴櫎鎵�鏈変换鍔′俊鎭�
+ if (s7DataZKDLPOne.getId1().equals(s7DataZKDLPOne.getId1())) {
+ //todo:娓呯┖浠诲姟
+ s7DataZKDLPOne.setFrom1(0);
+ s7DataZKDLPOne.getId1();
+ }
+ 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>()
@@ -870,7 +902,11 @@
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()));
}
--
Gitblit v1.8.0