YiWuProject.git

			@@ -80,6 +80,8 @@

			@Scheduled(fixedDelay = 1000)
			public void plcHomeEdgTask() {
			Date startDate = new Date();
			log.info("本次任务开始执行时间：{}", startDate);
			PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
			String taskRequestTypeValue = plcParameterObject.getPlcParameter("A06_request_word").getValue();
			String glassIdeValue = plcParameterObject.getPlcParameter("A05_scanning_ID").getValue();
			@@ -124,6 +126,8 @@
			inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
			}
			}
			Date endDate = new Date();
			log.info("本次任务结束时间：{}，共耗时：{}ms", endDate, endDate.getTime() - startDate.getTime());
			}

			public void plcToHomeEdgTask() {
			@@ -241,7 +245,7 @@
			// 1.2.3、按照出片信息去详情表查询格子在笼子里面剩余相同尺寸的玻璃数据且以版图id、版序升序排序取第一块玻璃出片
			// 2、如果没有历史出片任务
			// 2.1、出当前版图id最小版序最小的玻璃（问题：两条线都没有历史任务，出片时两条线的玻璃尺寸相同，是否找尺寸不同的）
			if (out08Glassstate == 2 && out10Glassstate == 2) {
			if ((out08Glassstate == 2 && out10Glassstate == 2) \|\| (out08Glassstate == 0 && out10Glassstate == 0)) {
			log.info("A09、A10为{},{}非自动状态，无法出片");
			return Boolean.FALSE;
			}
			@@ -263,10 +267,10 @@
			EdgStorageCageDetails a10EdgGlass = queryGlassByTaskCache(Const.A10_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
			endcell = queryLineByGlassInfo(a09EdgGlass, a10EdgGlass, glassInfo, out08Glassstate, out10Glassstate);
			} else {
			//判断两条线是否都空闲
			endcell = out10Glassstate == 2 ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
			//按照状态判断两条线走那条线
			endcell = computerLineByState(out08Glassstate, out10Glassstate);

			if ((out08Glassstate == 0 && out10Glassstate == 0) \|\| (out08Glassstate == 1 && out10Glassstate == 1)) {
			if (out08Glassstate == 1 && out10Glassstate == 1) {
			EdgStorageCageDetails a09EdgGlass = queryGlassByTaskCache(Const.A09_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
			EdgStorageCageDetails a10EdgGlass = queryGlassByTaskCache(Const.A10_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
			if (a09EdgGlass == null && a10EdgGlass == null) {
			@@ -486,13 +490,15 @@
			boolean b10 = a10EdgStorageCageDetails != null && a10EdgStorageCageDetails.getHeight() == glassInfo.getHeight()
			&& a10EdgStorageCageDetails.getWidth() == glassInfo.getWidth();
			//存在出片任务 07为空
			if (b10) {
			return out10Glassstate == 2 ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
			if (out08Glassstate == 1 && out10Glassstate == 1) {
			if (b08) {
			return Const.A09_OUT_TARGET_POSITION;
			}
			if (b10) {
			return Const.A10_OUT_TARGET_POSITION;
			}
			}
			if (b08) {
			return out08Glassstate == 2 ? Const.A10_OUT_TARGET_POSITION : Const.A09_OUT_TARGET_POSITION;
			}
			return out10Glassstate == 2 ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
			return computerLineByState(out08Glassstate, out10Glassstate);
			}

			/**
			@@ -654,74 +660,43 @@
			}

			/**
			* 当前切割版图信息
			* 计算出片线路
			* 已排除都为2 都为0 的情况
			*
			* @param
			* @param out08Glassstate
			* @param out10Glassstate
			* @return
			*/
			@Scheduled(fixedDelay = 1000)
			public void currentCutTerritory() {
			JSONObject jsonObject = new JSONObject();
			List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
			jsonObject.append("currentCutTerritory", currentCutTerritorys);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass");
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {
			if (webserver != null) {
			webserver.sendMessage(jsonObject.toString());
			List<String> messages = webserver.getMessages();
			if (!messages.isEmpty()) {
			// // 将最后一个消息转换为整数类型的列表
			webserver.clearMessages();
			}
			} else {
			log.info("Home is closed");
			}
			private int computerLineByState(int out08Glassstate, int out10Glassstate) {
			if (out08Glassstate == 0) {
			if (out10Glassstate == 2) {
			return Const.A09_OUT_TARGET_POSITION;
			} else {
			return Const.A10_OUT_TARGET_POSITION;
			}
			} else if (out08Glassstate == 1) {
			return Const.A09_OUT_TARGET_POSITION;
			} else {
			return Const.A10_OUT_TARGET_POSITION;
			}
			}

			/**
			* 磨边任务
			*
			* @param
			* @return
			*/
			@Scheduled(fixedDelay = 1000)
			public void selectEdgTask() {
			public void CacheGlassTasks() {
			JSONObject jsonObject = new JSONObject();
			//识别摆片
			List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
			jsonObject.append("currentCutTerritory", currentCutTerritorys);
			//磨边信息
			List<Map<String, Object>> EdgTasks1 = taskCacheService.selectEdgInfo("2001");
			List<Map<String, Object>> EdgTasks2 = taskCacheService.selectEdgInfo("2002");
			jsonObject.append("EdgTasks1", EdgTasks1);
			jsonObject.append("EdgTasks2", EdgTasks2);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass");
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {
			if (webserver != null) {
			webserver.sendMessage(jsonObject.toString());
			List<String> messages = webserver.getMessages();
			if (!messages.isEmpty()) {
			// // 将最后一个消息转换为整数类型的列表
			webserver.clearMessages();
			}
			} else {
			log.info("Home is closed");
			}
			}
			}
			}

			/**
			* 磨边前缓存内信息
			*
			* @param
			* @return
			*/
			@Scheduled(fixedDelay = 1000)
			public void selectEdgStorageCage() {
			JSONObject jsonObject = new JSONObject();
			//卧室缓存笼内信息
			List<Map<String, Object>> EdgStorageCageinfos = edgStorageCageService.selectEdgStorageCages();
			jsonObject.append("EdgStorageCageinfos", EdgStorageCageinfos);

			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass");
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {