From 5239cce7fa290e3522803c1982054dcba3c8e1e7 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 17 六月 2025 14:16:56 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 3 +--
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 19 +++++++++++++------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index d53d7a5..c88b656 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -493,8 +493,7 @@
temperingGlassInfoMapper.delete(new LambdaQueryWrapper<TemperingGlassInfo>()
.eq(TemperingGlassInfo::getEngineerId, glassInfo.getEngineerId())
.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW)
- .ge(TemperingGlassInfo::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
- .gt(TemperingGlassInfo::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence())
+ .notIn(TemperingGlassInfo::getGlassId, glassIdList)
);
return Boolean.TRUE;
}
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 0805962..4393451 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
@@ -325,12 +325,19 @@
//鑾峰彇绌洪棽涓旈鍙栦换鍔＄殑鏁版嵁淇℃伅锛屾病鏈変换鍔＄洿鎺ヨ蛋鐜荤拑璋冨害
HashMap<Integer, ReadWriteEntity> map = new HashMap<>();
- ReadWriteEntity oneEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
- ReadWriteEntity twoEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
- ReadWriteEntity threeEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree03");
- map.put(930, oneEntity);
- map.put(931, twoEntity);
- map.put(932, threeEntity);
+ try {
+ map.put(930, miloService.readFromOpcUa("CMJ1.CMJ1.isFree"));
+ } catch (Exception e) {
+ //nothing
+ log.info("涓�绾跨┖闂茬姸鎬佽幏鍙栧紓甯�");
+ }
+ try {
+ map.put(931, miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree"));
+ map.put(932, miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree03"));
+ } catch (Exception e) {
+ //nothing
+ log.info("浜�/涓夌嚎绾跨┖闂茬姸鎬佽幏鍙栧紓甯�");
+ }
HollowGlassOutRelationInfo hollowGlassOutRelationInfo = null;
int cell = -1;
for (int i = 930; i <= 932; i++) {
--
Gitblit v1.8.0