From 9ac149efc825b9237d5e483d63dd15604f0bc30b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 01 四月 2025 17:01:32 +0800
Subject: [PATCH] 1、切割识别界面提供原片尺寸。 2、fixbug：当工程下的版图切割完毕后，界面显示工程号+最大版序+1bug 3、系统参数配置：新增系统参数配置，存入redis，方便后续各个模块调用。后续工作：将各个模块的配置参数由配置文件调整为数据库记录。
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 78ec958..a001af5 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -11,10 +11,9 @@
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.damage.entity.Damage;
-import com.mes.damage.mapper.DamageMapper;
+import com.mes.damage.entity.request.DamageRequest;
import com.mes.damage.service.DamageService;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
-import com.mes.damage.entity.request.DamageRequest;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
@@ -33,6 +32,8 @@
import com.mes.pp.mapper.OptimizeHeatDetailMapper;
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.TaskCacheService;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -75,6 +76,9 @@
@Autowired
DamageService damageService;
+ @Resource
+ UpPattenUsageMapper upPattenUsageMapper;
+
@Autowired
EdgGlassTaskInfoService edgGlassTaskInfoService;
@@ -108,10 +112,16 @@
}
}
JSONObject jsonObject = new JSONObject();
- List<CutDrawingVO> currentCutDrawings = baseMapper.queryCutDrawingByEngineerId(engineering.getEngineerId(), patternSequence, 0);
+ List<CutDrawingVO> currentCutDrawings = baseMapper.queryCutDrawingByEngineerId(engineering.getEngineerId(), patternSequence, 0);
jsonObject.append("currentCutTerritory", currentCutDrawings);
- jsonObject.append("engineer", engineering.getEngineerId());
- jsonObject.append("sequence", patternSequence);
+ if (CollectionUtil.isNotEmpty(currentCutDrawings)) {
+ jsonObject.append("engineer", engineering.getEngineerId());
+ jsonObject.append("sequence", patternSequence);
+ UpPattenUsage upPattenUsage = upPattenUsageMapper.selectOne(new LambdaQueryWrapper<UpPattenUsage>()
+ .eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId())
+ .eq(UpPattenUsage::getLayoutSequence, patternSequence));
+ jsonObject.append("upPattenUsage", upPattenUsage);
+ }
return jsonObject;
}
@@ -122,6 +132,9 @@
List<GlassInfo> glassInfoList = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getEngineerId, engineerId));
long totalPatternSequence = glassInfoList.stream().map(GlassInfo::getPatternSequence).distinct().count();
map.put("totalPatternSequence", totalPatternSequence);
+ UpPattenUsage upPattenUsage = upPattenUsageMapper.selectOne(new LambdaQueryWrapper<UpPattenUsage>().eq(UpPattenUsage::getEngineeringId, engineerId)
+ .eq(UpPattenUsage::getLayoutSequence, patternSequence));
+ map.put("upPattenUsage", upPattenUsage);
return map;
}
--
Gitblit v1.8.0