YiWuProject.git

			@@ -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;
			@@ -27,12 +26,15 @@
			import com.mes.engineering.mapper.EngineeringMapper;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.largenscreen.entity.PieChartVO;
			import com.mes.pp.entity.OptimizeHeatDetail;
			import com.mes.pp.entity.OptimizeHeatLayout;
			import com.mes.pp.entity.OptimizeProject;
			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 +77,9 @@
			@Autowired
			DamageService damageService;

			@Resource
			UpPattenUsageMapper upPattenUsageMapper;

			@Autowired
			EdgGlassTaskInfoService edgGlassTaskInfoService;

			@@ -108,10 +113,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 +133,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;

			}
			@@ -340,8 +354,13 @@
			}

			@Override
			public EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height) {
			return baseMapper.queryEdgStorageDetailsBySize(deviceId, currentSlot, width, height);
			public EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height, int cell, int maxThickness) {
			return baseMapper.queryEdgStorageDetailsBySize(deviceId, currentSlot, width, height, cell, maxThickness);
			}

			@Override
			public EdgStorageCageDetails queryEdgStorageDetailsByLimitSize(int deviceId, Integer currentCell, double width, double height, int cell, int minOneFirstLength, int minOneSecondLength, int maxTwoFirstLength, int maxTwoSecondLength, int maxThickness) {
			return baseMapper.queryEdgStorageDetailsByLimitSize(deviceId, currentCell, width, height, cell, minOneFirstLength, minOneSecondLength, maxTwoFirstLength, maxTwoSecondLength, maxThickness);
			}

			@Override
			@@ -356,4 +375,9 @@
			public List<EdgSlotRemainVO> querySlotRemainWidth(int cellLength, int glassGap) {
			return this.baseMapper.querySlotRemainWidth(cellLength, glassGap);
			}

			@Override
			public List<PieChartVO> queryPieChart() {
			return this.baseMapper.queryPieChart();
			}
			}