~admin/HangZhouMes.git

			@@ -137,7 +137,7 @@
			//加笼子里面是否有玻璃，有先出，无玻璃先进
			boolean outFlase = outTo(Integer.parseInt(out08Glassstate),
			Integer.parseInt(out10Glassstate), confirmationWrodAddress, glassIdeValue, Integer.parseInt(currentSlot));
			log.info("出片任务是否完成：{},失败且玻璃id:{}不为空则执行进片任务", outFlase, glassIdeValue);
			log.info("出片任务是否完成：{},且玻璃id:{}不为空则执行进片任务", outFlase, glassIdeValue);
			if (!outFlase && StringUtils.isNotBlank(glassIdeValue)) {
			inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
			}
			@@ -146,23 +146,6 @@
			log.info("本次任务结束时间：{}，共耗时：{}ms", endDate, endDate.getTime() - startDate.getTime());
			}

			@Scheduled(fixedDelay = 1000)
			public void temperingIsRun() {
			JSONObject jsonObject = new JSONObject();
			//正在进行的任务
			List<TaskCache> taskCaches = taskCacheService.selectTaskCacheIsRun();
			jsonObject.append("taskCaches", taskCaches);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {
			if (webserver != null) {
			webserver.sendMessage(jsonObject.toString());
			} else {
			log.info("Home is closed");
			}
			}
			}
			}

			@Scheduled(fixedDelay = 1000)
			public void dealDamageTask() {
			@@ -574,7 +557,7 @@
			if (endcell == Const.A10_OUT_TARGET_POSITION) {
			wrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
			"case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
			"on t.glass_id = t1.glass_id and (t1.first_length >= " + minOneFirstLength + " and t1.second_length >= " + minOneSecondLength);
			"on t.glass_id = t1.glass_id and (t1.first_length >= " + minOneFirstLength + " and t1.second_length >= " + minOneSecondLength + ")");
			} else {
			wrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
			"case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
			@@ -697,7 +680,7 @@
			}

			/**
			* 添加理片笼任务
			* 添加磨边队列信息
			*
			* @param glassInfo
			* @param endcell
			@@ -743,14 +726,6 @@
			public void CacheGlassTasks() {
			JSONObject jsonObject = new JSONObject();
			List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
			// List<Map<String, Object>> currentCutTerritorys=new ArrayList<>();
			// if(engineerId==null\|\|engineerId.isEmpty()){
			// //识别摆片当前版图数据
			// currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
			// }else{
			// //识别摆片此engineerId 工程版图数据
			// currentCutTerritorys = edgStorageCageDetailsService.selectCurrentCutTerritory(engineerId);
			// }
			jsonObject.append("currentCutTerritory", currentCutTerritorys);
			//log.info("本次识别版图{},++++{}",engineerId,currentCutTerritorys);
			//磨边信息
			@@ -782,7 +757,7 @@
			public void cacheGlassIsRun() {
			JSONObject jsonObject = new JSONObject();
			//正在进行的任务
			List<TaskCache> taskCaches = taskCacheService.selectTaskCacheIsRun();
			List<EdgGlassTaskInfo> taskCaches = edgGlassTaskInfoService.selectTaskCacheIsRun();
			jsonObject.append("taskCaches", taskCaches);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlassIsRun");
			if (sendwServer != null) {