YiWuProject.git

			@@ -120,10 +120,17 @@
			JSONObject jsonObject = new JSONObject();
			//正在进行的任务
			List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
			jsonObject.append("prioritylist", upPattenUsages);
			if(upPattenUsages!=null){
			jsonObject.append("prioritylist", upPattenUsages);
			}

			//工位信息
			List<UpWorkstation> upWorkstations = upWorkstationService.list();
			jsonObject.append("list", upWorkstations);
			//是否开始工程
			Engineering engineering = engineeringService.selectInitiate(1);
			jsonObject.append("engineering", engineering);

			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
			if (sendwServer != null) {
			for (WebSocketServer webserver : sendwServer) {
			@@ -145,8 +152,8 @@
			public void loadGlassStatus() {
			JSONObject jsonObject = new JSONObject();
			//正在进行的任务
			String inkageStatus = plcParameterObject.getPlcParameter("MesToPlc").getValue();
			//String inkageStatus ="1";
			String inkageStatus =plcParameterObject.getPlcParameter("InkageStatus").getValue();
			// String inkageStatus ="1";
			jsonObject.append("InkageStatus", inkageStatus);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
			if (sendwServer != null) {
			@@ -159,6 +166,26 @@
			}
			}
			}
			@Scheduled(fixedDelay = 1000)
			public void loadGlassIsRun() {
			JSONObject jsonObject = new JSONObject();
			Engineering engineering = engineeringService.selectInitiate(1);
			if (engineering != null){
			jsonObject.append("engineering", engineering);
			}else {
			jsonObject.append("engineering", "0");
			}
			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");
			}
			}
			}
			}

			public void overTask(String loadStatus, int state) {