HangZhouMes.git

			@@ -120,12 +120,12 @@
			out08Glassstate = "1";
			}

			// taskRequestTypeValue = "3";
			// taskRequestTypeValue = "2";
			// out08Glassstate = "1";
			// out10Glassstate = "1";
			// currentSlot = "1";
			// confirmationWrodValue = "0";
			// glassIdeValue = "P25010108\|44\|1";
			// glassIdeValue = "P25021704\|75\|12";

			log.info("1、获取到的请求字为：{}，获取到的扫描ID为：{}，获取到的确认字为：{}，获取到的出片状态分别为：A09:{}、A10:{},当前格子号为：{}",
			taskRequestTypeValue, glassIdeValue, confirmationWrodValue, out08Glassstate, out10Glassstate, currentSlot);
			@@ -395,8 +395,19 @@
			endcell = queryLineByGlassInfo(a09EdgGlass, a10EdgGlass, glassInfo, out08Glassstate, out10Glassstate);
			} else {
			//按照状态判断两条线走那条线
			endcell = computerLineByState(out08Glassstate, out10Glassstate);

			GlassInfo glassInfos = glassInfoService.getOne(
			new LambdaQueryWrapper<GlassInfo>()
			.eq(GlassInfo::getGlassId, glassId)
			);
			if (glassInfos != null) {
			if (Math.max(glassInfos.getWidth(), glassInfos.getHeight()) > Integer.parseInt(firstLength) && out08Glassstate == 1) {
			endcell = Const.A09_OUT_TARGET_POSITION;
			} else {
			endcell = computerLineByState(out08Glassstate, out10Glassstate);
			}
			} else {
			endcell = computerLineByState(out08Glassstate, out10Glassstate);
			}
			if (out08Glassstate == 1 && out10Glassstate == 1) {
			EdgStorageCageDetails a09EdgGlass = queryGlassByTaskCache(Const.A09_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
			EdgStorageCageDetails a10EdgGlass = queryGlassByTaskCache(Const.A10_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
			@@ -419,19 +430,21 @@
			wrapper.last("order by count(t.glass_id) desc limit 2");
			List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(wrapper);
			if (CollectionUtil.isEmpty(list)) {
			log.info("笼子内没有找到合适的玻璃");
			MPJQueryWrapper<GlassInfo> queryWrapper = new MPJQueryWrapper<GlassInfo>()
			.selectAll(GlassInfo.class).eq("t.glass_id", glassId);
			if (endcell == Const.A10_OUT_TARGET_POSITION) {
			queryWrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
			queryWrapper.leftJoin("(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 + ") ");
			} else {
			queryWrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
			queryWrapper.leftJoin("(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 + ") ");
			}
			GlassInfo one = glassInfoService.getOne(queryWrapper);
			log.info("找到合适的玻璃" + one);
			if (one != null) {
			EdgStorageCageDetails resultDetails = new EdgStorageCageDetails();
			BeanUtils.copyProperties(one, resultDetails);
			@@ -479,6 +492,10 @@
			}
			}
			}
			}
			if (endcell == Const.A09_OUT_TARGET_POSITION && Math.min(glassInfo.getWidth(), glassInfo.getHeight()) < Integer.parseInt(minOneFirstLength)) {
			log.info("尺寸不符合最大线最小尺寸{}", glassInfo);
			return Boolean.FALSE;
			}
			return saveOutGlassMessageBySlot(glassInfo, endcell, confirmationWrodAddress, glassId, currentSlot);
			}
			@@ -908,18 +925,17 @@
			}
			}

			@Scheduled(fixedDelay = 500)
			@Scheduled(fixedDelay = 3000)
			public void CacheGlassTasks() {
			JSONObject jsonObject = new JSONObject();
			List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
			jsonObject.append("currentCutTerritory", currentCutTerritorys);
			//log.info("本次识别版图{},++++{}",engineerId,currentCutTerritorys);
			//卧室缓存笼内信息
			List<Map<String, Object>> EdgStorageCageinfos = edgStorageCageService.selectEdgStorageCages();
			jsonObject.append("EdgStorageCageinfos", EdgStorageCageinfos);

			ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass");
			if (sendwServer != null) {
			JSONObject jsonObject = new JSONObject();
			List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
			jsonObject.append("currentCutTerritory", currentCutTerritorys);
			//log.info("本次识别版图{},++++{}",engineerId,currentCutTerritorys);
			//卧室缓存笼内信息
			List<Map<String, Object>> EdgStorageCageinfos = edgStorageCageService.selectEdgStorageCages();
			jsonObject.append("EdgStorageCageinfos", EdgStorageCageinfos);
			for (WebSocketServer webserver : sendwServer) {
			if (webserver != null) {
			webserver.sendMessage(jsonObject.toString());
			@@ -935,7 +951,7 @@
			}
			}

			@Scheduled(fixedDelay = 500)
			@Scheduled(fixedDelay = 3000)
			public void cacheGlassIsRun() {
			JSONObject jsonObject = new JSONObject();
			//正在进行的任务
			@@ -953,7 +969,7 @@
			}
			}

			@Scheduled(fixedDelay = 500)
			@Scheduled(fixedDelay = 3000)
			public void CacheGlassTaskss() {
			JSONObject jsonObject = new JSONObject();
			//log.info("本次识别版图{},++++{}",engineerId,currentCutTerritorys);