~zhoushihao/YiWuProject.git

			@@ -104,10 +104,7 @@
			}

			public void currentCutDrawingTaskChild(String webSocketName, int deviceId, int stationCell) {
			JSONObject jsonObject = new JSONObject();
			List<CutDrawingVO> currentCutDrawings = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
			jsonObject.append("currentCutTerritory", currentCutDrawings);

			JSONObject jsonObject = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get(webSocketName);
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {
			@@ -160,7 +157,7 @@
			);
			List<EdgStorageDeviceTaskHistory> edgTwoTasks = edgStorageDeviceTaskHistoryService.list(
			new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
			.eq(EdgStorageDeviceTaskHistory::getDeviceId, 1)
			.eq(EdgStorageDeviceTaskHistory::getDeviceId, 2)
			.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE)
			);
			jsonObject.append("edgOneTasks", edgOneTasks);
			@@ -168,13 +165,15 @@
			List<Engineering> engineeringOne = engineeringService.list(
			new LambdaQueryWrapper<Engineering>()
			.eq(Engineering::getStationCell, 5)
			.eq(Engineering::getState, 0)
			);
			List<Engineering> engineeringTow = engineeringService.list(
			new LambdaQueryWrapper<Engineering>()
			.eq(Engineering::getStationCell, 6)
			.eq(Engineering::getState, 0)
			);
			jsonObject.append("engineeringOne", engineeringOne);
			jsonObject.append("engineeringTow", engineeringTow);
			jsonObject.append("engineeringTwo", engineeringTow);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {