From af7f09e7965887b034c9add213bf68c816f22338 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 19 九月 2025 18:02:36 +0800
Subject: [PATCH] 中空理片笼缺片详情改造，中空一线二线三线页面改造
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
index 14d0ff2..49bb670 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.common.config.Const;
+import com.mes.common.config.ConstSysConfig;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.hollow.controller.HollowBigStorageCageController;
@@ -24,6 +25,7 @@
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
import com.mes.largenscreen.entity.PieChartVO;
+import com.mes.sysconfig.service.SysConfigService;
import com.mes.tools.DateUtil;
import com.mes.utils.Blank;
import com.mes.utils.RedisUtil;
@@ -33,8 +35,8 @@
import freemarker.template.Version;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.*;
@@ -62,24 +64,28 @@
HollowFormulaDetailsService hollowFormulaDetailsService;
@Resource
HollowGlassRelationInfoService hollowGlassRelationInfoService;
+ @Resource
+ SysConfigService sysConfigService;
@Resource
RedisUtil redisUtil;
- @Value("${mes.glassGap}")
- private Integer glassGap;
-
- @Value("${mes.carWidth}")
- private Integer carWidth;
+// @Value("${mes.glassGap}")
+// private Integer glassGap;
+//
+// @Value("${mes.carWidth}")
+// private Integer carWidth;
private static final int ID_RATIO = 10;
@Override
+ @Transactional
public HollowGlassOutRelationInfo receiveTask(HollowTaskRequest request) {
return childrenTask(request, 0);
}
@Override
+ @Transactional
public HollowGlassOutRelationInfo forceOutGlass(HollowTaskRequest request) {
return childrenTask(request, 1);
}
@@ -88,6 +94,12 @@
public Boolean dispatchHollowSwitch(Boolean flag) {
redisUtil.setCacheObject("dispatchHollowSwitch", flag);
return redisUtil.getCacheObject("dispatchHollowSwitch");
+ }
+
+ @Override
+ public Boolean priorityHollowSwitch(Boolean flag) {
+ redisUtil.setCacheObject("priorityHollowSwitch", flag);
+ return redisUtil.getCacheObject("priorityHollowSwitch");
}
@Override
@@ -359,7 +371,9 @@
.queryOutGlassList(request.getFlowCardId(), request.getCell());
int isPairCount = glassInfo.getTotalLayer() * request.getTotalPairQuantity();
List<HollowGlassQueueInfo> hollowQueues = new ArrayList<>();
-
+ Integer carWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_CAR_WIDTH);
+// Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
+ Integer glassGap = hollowGlassRelationInfoService.getGlassGapByThickness(hollowBigStorageCageDetailsList.get(0).getThickness());
if (930 == request.getCell()) {
Map<Integer, List<HollowBigStorageCageDetails>> listMap = hollowBigStorageCageDetailsList.stream()
.collect(Collectors.groupingBy(HollowBigStorageCageDetails::getHollowSequence));
@@ -428,7 +442,7 @@
}
@Override
- public List<PieChartVO> queryPieChart(){
+ public List<PieChartVO> queryPieChart() {
return baseMapper.queryPieChart();
}
}
--
Gitblit v1.8.0