~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);
			}
			@@ -726,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);
			//磨边信息