~admin/HangZhouMes.git

			@@ -30,7 +30,7 @@
			//获取等待进炉中的玻璃信息
			QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
			//wrapper.eq("state",1);
			wrapper.in("state",1,0);
			wrapper.in("state",1,0,-1);
			return temperingMapper.selectList(wrapper);
			}

			@@ -66,7 +66,7 @@
			List<OptimizeUpPattenUsage> upPattenUsageList = null;
			if (engineeringId != null) {
			upPattenUsageList = optimizeProjectMapper.selectJoinList(OptimizeUpPattenUsage.class, new MPJQueryWrapper<OptimizeProject>()
			.select("t.project_no,t.glass_type,b.width,b.height ,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.count")
			.select("t.project_no,t.glass_type,b.width,b.height ,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.count as stockId")
			.leftJoin("optimize_layout b on t.project_no=b.project_no")
			.eq("b.project_no", engineeringId));
			}

			@@ -25,7 +25,7 @@
			* fixedDelay : 上一个调用结束后再次调用的延时
			*/

			@Scheduled(fixedDelay = 2000)
			@Scheduled(fixedDelay = 1000)
			public void temperingGlassHome(){
			JSONObject jsonObject = new JSONObject();
			//正在等待进片的玻璃
			@@ -34,12 +34,14 @@
			//获取整在炉中的两个版图id
			List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
			//进炉中的玻璃
			if(!layoutId.isEmpty()) {
			List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0).getTemperingLayoutId());
			jsonObject.append("intoGlass", intoGlass);
			//进炉中的第二个版图
			if (layoutId.size() > 1) {
			List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1).getTemperingLayoutId());
			jsonObject.append("intoGlass2", intoGlass2);
			}
			}
			//出炉后的玻璃
			List<TemperingGlassInfo> outGlass = temperingAgoService.selectOutGlass();
			@@ -60,5 +62,23 @@
			}
			}
			}
			@Scheduled(fixedDelay = 1000)
			public void temperingIsRun(){
			JSONObject jsonObject = new JSONObject();
			//正在进行的任务
			List<TemperingGlassInfo>temperingTaskType=temperingAgoService.selectTaskType();
			jsonObject.append("temperingTaskType", temperingTaskType);
			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");
			}
			}
			}
			}


			}

	hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史