From 97789ba474555471e0347928e148f5971ad4285a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 15 十二月 2025 09:49:33 +0800
Subject: [PATCH] 1、 fixbug：中空创建任务查询异常 2、中空线关闭预先送一车逻辑
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 49 ++++++++++++++++---------------------------------
1 files changed, 16 insertions(+), 33 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 3f8fe30..3d8d532 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>()
@@ -509,20 +492,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) {
//鏄惁鍏佽涓┖
@@ -993,7 +976,7 @@
damage.setWorkingProcedure("纾ㄨ竟");
damage.setRemark("杩涚鍓嶅崸杞珛");
damage.setStatus(1);
- damage.setType(item.getTaskState());
+ damage.setType(Const.GLASS_STATE_DAMAGE);
damageService.insertDamage(damage);
slotList.add(item.getTargetSlot());
}
@@ -1018,7 +1001,7 @@
damage.setWorkingProcedure("涓┖鍓�");
damage.setRemark("杩涚鍚庡崸杞珛");
damage.setStatus(1);
- damage.setType(item.getTaskState());
+ damage.setType(Const.GLASS_STATE_DAMAGE);
damageService.insertDamage(damage);
slotList.add(item.getTargetSlot());
slotList.add(item.getStartSlot());
--
Gitblit v1.8.0