From 994b07344c976abcb33ff5eaecd685f6461be5ea Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 17 十二月 2025 11:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 49 +++++++++++++++++--------------------------------
1 files changed, 17 insertions(+), 32 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 a9fd872..0a7de37 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
@@ -262,23 +262,6 @@
}
}
// }
- //瓒呭ぇ灏哄
-// Integer slotMaxHeight = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_MAX_HEIGHT);
-// Integer slotMaxthickness = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_MAX_THICKNESS);
-// if (slotMaxHeight < Math.min(glassInfoList.get(0).getWidth(), glassInfoList.get(0).getHeight()) || glassInfoList.get(0).getThickness() >= slotMaxthickness) {
-// int count = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
-// .eq(HollowBigStorageCageDetails::getSlot, THROUGH_SLOT)
-// .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
-// if (count > 0) {
-// log.info("鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝缁撴潫鏈杩涚墖");
-// //鍚憄lc鍙戦�佹姤璀�:鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝鏃犳硶缁х画鐩撮��
-// s7DataZKDLPOne = new S7DataZKDLPOne();
-// s7DataZKDLPOne.setAlramSignal(64);
-// s7SerializerZKDLPOne.write(s7DataZKDLPOne);
-// return;
-// }
-// }
-
log.info("灏嗛挗鍖栧皬鐗囪〃鍐呯殑鐘舵�佹敼涓洪挗鍖栫粨鏉燂紝鐜荤拑id鏈夛細{}", glassIdList);
//淇敼閽㈠寲浠诲姟琛ㄤ腑鐨勭姸鎬�
temperingGlassInfoService.update(new LambdaUpdateWrapper<TemperingGlassInfo>()
@@ -286,7 +269,9 @@
//鎶ュ伐
log.info("灏嗘帴鏀跺埌鐨勭幓鐠冭繘琛岄挗鍖栬嚜鍔ㄦ姤宸ワ紝鐜荤拑id鏈夛細{}", glassIdList);
for (String glass : glassIdList) {
- damageService.autoSubmitReport(glass, inTaskList.get(0).getStartSlot(), "閽㈠寲", "杩涗腑绌虹悊鐗囩", 1);
+ if (from.equals(910)) {
+ damageService.autoSubmitReport(glass, inTaskList.get(0).getStartSlot(), "閽㈠寲", "杩涗腑绌虹悊鐗囩", 1);
+ }
}
Map<String, List<GlassInfo>> glassListMap = glassInfoList.stream().collect(Collectors.groupingBy(GlassInfo::getGlassId));
@@ -509,20 +494,20 @@
break;
}
}
- for (Integer i : resultList) {
- if (null == hollowGlassOutRelationInfo) {
- cell = i;
- hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
- .getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
- .eq(HollowGlassOutRelationInfo::getCell, cell)
- .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
- .orderByAsc(HollowGlassOutRelationInfo::getId)
- .last("limit 1")
- );
- } else {
- break;
- }
- }
+// for (Integer i : resultList) {
+// if (null == hollowGlassOutRelationInfo) {
+// cell = i;
+// hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
+// .getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
+// .eq(HollowGlassOutRelationInfo::getCell, cell)
+// .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
+// .orderByAsc(HollowGlassOutRelationInfo::getId)
+// .last("limit 1")
+// );
+// } else {
+// break;
+// }
+// }
if (null != hollowGlassOutRelationInfo) {
//鏄惁鍏佽涓┖
--
Gitblit v1.8.0