YiWuProject.git

			@@ -9,6 +9,7 @@
			import com.mes.tools.WebSocketServer;
			import com.mes.uppattenusage.entity.UpPattenUsage;
			import com.mes.uppattenusage.service.UpPattenUsageService;
			import com.mes.utils.RedisUtil;
			import com.mes.workstation.entity.UpWorkstation;
			import com.mes.workstation.service.UpWorkstationService;
			import lombok.extern.slf4j.Slf4j;
			@@ -34,7 +35,8 @@
			private UpPattenUsageService upPattenUsageService;
			@Autowired
			private OptimizeProjectService optimizeProjectService;

			@Autowired
			RedisUtil redisUtil;

			PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;

			@@ -123,20 +125,28 @@
			if(upPattenUsages!=null){
			jsonObject.append("prioritylist", upPattenUsages);
			}
			//查询1、2号线的任务
			List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(5);
			//查询1号线的任务
			Engineering request = redisUtil.getCacheObject("loadGlassRequest");
			if (request == null) {
			request = new Engineering();
			request.setStationCell(5);
			}
			List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(request);
			jsonObject.append("loadTask1", upPattenUsages1);
			//查询1、2号线的任务
			List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(6);
			//查询2号线的任务
			Engineering request2 = redisUtil.getCacheObject("loadGlassRequest2");
			if (request2 == null) {
			request2 = new Engineering();
			request2.setStationCell(6);
			}
			List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(request2);
			jsonObject.append("loadTask2", upPattenUsages2);

			//查询工位任务


			//工位信息
			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) {