YiWuProject.git

			@@ -21,7 +21,6 @@
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.taskcache.entity.TaskCache;
			import com.mes.taskcache.service.TaskCacheService;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.tools.WebSocketServer;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.lang.StringUtils;
			@@ -87,7 +86,7 @@
			@Value("${mes.min.two.secondLength}")
			private String minTwoSecondLength;

			public static String engineerId="";
			public static String engineerId = "";

			@Scheduled(fixedDelay = 1000)
			public void plcHomeEdgTask() {
			@@ -140,11 +139,12 @@
			Date endDate = new Date();
			log.info("本次任务结束时间：{}，共耗时：{}ms", endDate, endDate.getTime() - startDate.getTime());
			}

			@Scheduled(fixedDelay = 1000)
			public void temperingIsRun(){
			public void temperingIsRun() {
			JSONObject jsonObject = new JSONObject();
			//正在进行的任务
			List<TaskCache>taskCaches=taskCacheService.selectTaskCacheIsRun();
			List<TaskCache> taskCaches = taskCacheService.selectTaskCacheIsRun();
			jsonObject.append("taskCaches", taskCaches);
			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");
			if (sendwServer != null) {
			@@ -157,6 +157,7 @@
			}
			}
			}

			/**
			* 进片任务
			*
			@@ -316,7 +317,7 @@
			BeanUtils.copyProperties(one, resultDetails);
			glassInfo = resultDetails;
			} else {
			log.info("获取笼内玻璃和带进片玻璃为空或者不符合磨边尺寸");
			log.info("获取笼内玻璃和待进片玻璃为空或者不符合磨边尺寸");
			}
			} else {
			glassInfo = queryMinGlass(list.get(0).getWidth(), list.get(0).getHeight(), glassId);
			@@ -530,12 +531,12 @@
			if (endcell == Const.A10_OUT_TARGET_POSITION) {
			wrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
			"case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
			"on t.glass_id = t1.glass_id and (t1.first_length between " + minTwoFirstLength + " and " + firstLength
			+ " and t1.second_length between " + minTwoSecondLength + " and " + secondLength + ") ");
			"on t.glass_id = t1.glass_id and (t1.first_length >= " + minOneFirstLength + " and t1.second_length >= " + minOneSecondLength);
			} else {
			wrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
			"case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
			"on t.glass_id = t1.glass_id and (t1.first_length >=" + minOneFirstLength + " and t1.second_length>=" + minOneSecondLength + ") ");
			"on t.glass_id = t1.glass_id and (t1.first_length between " + minTwoFirstLength + " and " + firstLength
			+ " and t1.second_length between " + minTwoSecondLength + " and " + secondLength + ") ");
			}
			wrapper.last("order by count(t.glass_id) desc limit 2");
			List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(wrapper);
			@@ -698,7 +699,7 @@
			@Scheduled(fixedDelay = 1000)
			public void CacheGlassTasks() {
			JSONObject jsonObject = new JSONObject();
			List<Map<String, Object>> currentCutTerritorys= edgStorageCageDetailsService.selectCutTerritory();
			List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
			// List<Map<String, Object>> currentCutTerritorys=new ArrayList<>();
			// if(engineerId==null\|\|engineerId.isEmpty()){
			// //识别摆片当前版图数据