~zhoushihao/YiWuProject.git

			@@ -2,6 +2,7 @@

			import cn.hutool.core.collection.CollectionUtil;
			import cn.hutool.core.lang.Assert;
			import cn.hutool.json.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
			@@ -18,6 +19,7 @@
			import com.mes.edgstoragecage.entity.EdgStorageCage;
			import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
			import com.mes.edgstoragecage.entity.vo.CutDrawingVO;
			import com.mes.edgstoragecage.entity.vo.EdgSlotRemainVO;
			import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
			import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
			import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
			@@ -77,7 +79,7 @@
			EdgGlassTaskInfoService edgGlassTaskInfoService;

			@Override
			public List<CutDrawingVO> queryCurrentCutDrawing(int deviceId, int stationCell) {
			public JSONObject queryCurrentCutDrawing(int deviceId, int stationCell) {
			// 获取本条线当前正在执行的工程
			Engineering engineering = engineeringMapper.selectOne(new LambdaQueryWrapper<Engineering>()
			.eq(Engineering::getState, 1).eq(Engineering::getStationCell, stationCell));
			@@ -105,7 +107,12 @@
			patternSequence = lastGlass.getPatternSequence();
			}
			}
			return baseMapper.queryCutDrawingByEngineerId(engineering.getEngineerId(), patternSequence, 0);
			JSONObject jsonObject = new JSONObject();
			List<CutDrawingVO> currentCutDrawings = baseMapper.queryCutDrawingByEngineerId(engineering.getEngineerId(), patternSequence, 0);
			jsonObject.append("currentCutTerritory", currentCutDrawings);
			jsonObject.append("engineer", engineering.getEngineerId());
			jsonObject.append("sequence", patternSequence);
			return jsonObject;
			}

			@Override
			@@ -341,7 +348,12 @@
			public String edgDetailsOperate(DamageRequest request) {
			//卧式理片笼爆破损
			damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "卧式理片笼", request.getState());
			this.remove(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getGlassId,request.getGlassId()));
			this.remove(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getGlassId, request.getGlassId()));
			return "success";
			}

			@Override
			public List<EdgSlotRemainVO> querySlotRemainWidth(int cellLength, int glassGap) {
			return this.baseMapper.querySlotRemainWidth(cellLength, glassGap);
			}
			}