YiWuProject.git

			@@ -7,6 +7,7 @@
			import com.github.yulichang.query.MPJQueryWrapper;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.mes.common.S7object;
			import com.mes.common.WebSocketServer;
			import com.mes.common.config.Const;
			import com.mes.device.PlcParameterObject;
			import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
			@@ -51,6 +52,9 @@

			@Autowired
			EdgGlassTaskInfoService edgGlassTaskInfoService;

			@Autowired
			WebSocketServer webServerService;

			@Value("${mes.threshold}")
			private int threshold;
			@@ -111,6 +115,27 @@
			inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
			}
			}
			}

			public void plcToHomeEdgTask() {
			// log.info("推数据");
			// jsonObject.append("params", new short[] { 30, 40, });
			// ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
			// if (sendwServer != null) {
			// for (WebSocketServer webserver : sendwServer) {
			// webserver.sendMessage(jsonObject.toString());
			// if (webserver != null) {
			//
			// List<String> messages = webserver.getMessages();
			//
			// if (!messages.isEmpty()) {
			// // // 将最后一个消息转换为整数类型的列表
			// webserver.clearMessages();
			// }
			// }
			//
			// }
			// }
			}

			/**
			@@ -191,7 +216,7 @@
			}
			EdgStorageCageDetails a09EdgGlass = queryGlassByTaskCache(Const.A09_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT);
			EdgStorageCageDetails a10EdgGlass = queryGlassByTaskCache(Const.A10_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT);
			endcell = queryLineByGlassInfo(a09EdgGlass, a10EdgGlass, glassInfo, out08Glassstate, out08Glassstate);
			endcell = queryLineByGlassInfo(a09EdgGlass, a10EdgGlass, glassInfo, out08Glassstate, out10Glassstate);
			} else {
			//判断两条线是否都空闲
			endcell = out08Glassstate == 1 ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
			@@ -249,11 +274,13 @@
			private List<EdgStorageCageDetails> queryEdgAllGlass(String glassId) {
			List<EdgStorageCageDetails> glassList = new ArrayList<>();
			//获取待进片玻璃
			GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
			.eq(GlassInfo::getGlassId, glassId));
			EdgStorageCageDetails resultDetails = new EdgStorageCageDetails();
			BeanUtils.copyProperties(one, resultDetails);
			glassList.add(resultDetails);
			if(StringUtils.isNotBlank(glassId)){
			GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
			.eq(GlassInfo::getGlassId, glassId));
			EdgStorageCageDetails resultDetails = new EdgStorageCageDetails();
			BeanUtils.copyProperties(one, resultDetails);
			glassList.add(resultDetails);
			}
			//获取笼内玻璃
			List<EdgStorageCageDetails> details = edgStorageCageDetailsService.list(new LambdaQueryWrapper<EdgStorageCageDetails>()
			.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
			@@ -399,9 +426,13 @@
			MPJLambdaWrapper<EdgStorageCageDetails> wrapper = new MPJLambdaWrapper<>();
			wrapper.select(EdgStorageCageDetails::getWidth, EdgStorageCageDetails::getHeight)
			.selectCount(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails::getCount)
			.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.groupBy(EdgStorageCageDetails::getWidth, EdgStorageCageDetails::getHeight)
			.last("order by count(t.glass_id) desc limit 2");
			List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(wrapper);
			if (CollectionUtil.isEmpty(list)){
			return null;
			}
			log.info("获取笼子内数量前二的玻璃数量：{}", list);
			//获取宽高拍第一的玻璃信息
			EdgStorageCageDetails firstSize = list.get(0);
			@@ -526,7 +557,7 @@
			private boolean saveGlassSize(EdgStorageCageDetails glassInfo) {
			EdgGlassTaskInfo edgGlassTaskInfo = new EdgGlassTaskInfo();
			BeanUtils.copyProperties(glassInfo, edgGlassTaskInfo);
			edgGlassTaskInfo.setHeight((int) (glassInfo.getEdgHeight() * ratio));
			edgGlassTaskInfo.setHeight((int) (glassInfo.getHeight() * ratio));
			edgGlassTaskInfo.setWidth((int) (glassInfo.getWidth() * ratio));
			edgGlassTaskInfo.setThickness((int) (glassInfo.getThickness() * ratio));
			edgGlassTaskInfo.setStatus(Const.EDG_GLASS_BEFORE);