~zhoushihao/YiWuProject.git

			@@ -492,7 +492,7 @@
			.orderByDesc(EdgStorageDeviceTaskHistory::getCreateTime).last("limit 1"));
			//如果任务类型为1，3，将切割完成的玻璃自动报工
			if (Const.GLASS_CACHE_TYPE_IN_ALL.contains(taskHistory.getTaskType())) {
			damageService.autoSubmitReport(taskHistory.getGlassIdIn(), taskHistory.getDeviceId(),"切割","进卧理");
			damageService.autoSubmitReport(taskHistory.getGlassIdIn(), taskHistory.getDeviceId(),"切割","进卧理",1);
			}
			updateCellRemainWidth(cell, device, taskHistory);
			edgStorageDeviceTaskHistoryService.update(new LambdaUpdateWrapper<EdgStorageDeviceTaskHistory>()
			@@ -535,10 +535,23 @@
			.last("Limit 1");
			GlassInfo swapGlassInfo = glassInfoService.getOne(queryWrapper);
			if (swapGlassInfo != null && !glassInfo.getGlassId().equals(swapGlassInfo.getGlassId())) {

			int patternSequence = glassInfo.getPatternSequence();
			int xAxis = glassInfo.getXAxis();
			int yAxis = glassInfo.getYAxis();
			String swapGlassId = swapGlassInfo.getGlassId();
			log.info("将玻璃{}和玻璃{}，信息互换,进玻璃 {}", glassInfo, swapGlassInfo, swapGlassInfo);
			int swapPatternSequence = swapGlassInfo.getPatternSequence();
			int swapXAxis = swapGlassInfo.getXAxis();
			int swapYAxis = swapGlassInfo.getYAxis();
			swapGlassInfo.setGlassId(glassId);
			swapGlassInfo.setPatternSequence(patternSequence);
			swapGlassInfo.setXAxis(xAxis);
			swapGlassInfo.setYAxis(yAxis);
			glassInfo.setGlassId(swapGlassId);
			glassInfo.setPatternSequence(swapPatternSequence);
			glassInfo.setXAxis(swapXAxis);
			glassInfo.setYAxis(swapYAxis);
			log.info("将玻璃{}和玻璃{}，信息互换(原片序号及坐标除外),进玻璃 {}", glassInfo, swapGlassInfo, swapGlassInfo);
			glassInfoService.updateById(swapGlassInfo);
			glassInfoService.updateById(glassInfo);
			return swapGlassId;