From b7bbb981103d865be75a16b95d188326015b8aa6 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:54:28 +0800
Subject: [PATCH] 1、系统配置表新增钢化/中空间隙配置 2、钢化/中空新增厚度选择，按照厚度自动匹配对应的间隙，完成进入格子的片数的要求
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java
index 13340eb..e24376a 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java
@@ -146,7 +146,7 @@
return;
}
Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_SLOT_WIDTH);
- Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_GLASS_GAP);
+// Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_GLASS_GAP);
Integer outCarMaxSize = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_OUT_CAR_SIZE);
// Engineering engineering = engineeringMapper.selectOne(new LambdaQueryWrapper<Engineering>()
// .eq(Engineering::getEngineerId, glassInfo.getEngineerId()));
@@ -154,6 +154,7 @@
List<GlassInfo> glassInfoList = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>()
.eq(GlassInfo::getEngineerId, engineerId)
.orderByAsc(GlassInfo::getTemperingLayoutId).orderByAsc(GlassInfo::getTemperingFeedSequence));
+ Integer glassGap = getGlassGapByThickness(glassInfoList.get(0).getThickness());
Map<Integer, List<GlassInfo>> trmperingIdMap = glassInfoList.stream().collect(Collectors.groupingBy(GlassInfo::getTemperingLayoutId));
List<BigStorageGlassInfo> bigStorageGlassInfoList = new ArrayList<>();
//鏂瑰紡涓�锛氬皢鐜荤拑鎸夌増鍥俱�佺増搴� 渚濇鐢熸垚铏氭嫙鏍煎瓙淇℃伅锛屾牸瀛愪竴鐩村線鍚庣疮鍔�
@@ -214,5 +215,18 @@
}
+ private Integer getGlassGapByThickness(Double thickness) {
+ int sysKey = 0;
+ if (thickness >= 12 ) {
+ sysKey = ConstSysConfig.VERTICAL_GLASS_GAP_12;
+ } else if (thickness == 8) {
+ sysKey = ConstSysConfig.VERTICAL_GLASS_GAP_8;
+ } else if (thickness == 10) {
+ sysKey = ConstSysConfig.VERTICAL_GLASS_GAP_10;
+ } else {
+ sysKey = ConstSysConfig.VERTICAL_GLASS_GAP;
+ }
+ return sysConfigService.queryConfigValue(sysKey);
+ }
}
--
Gitblit v1.8.0