~admin/HangZhouMes.git

			@@ -334,22 +334,22 @@
			for (int i = 1; i <= groupBy.keySet().size(); i++) {
			String key = i + "";
			if (key != null) {
			List<Map<String, Object>> galssInfo=groupBy.get(key);//当前钢化版图内玻璃小片集合
			if(!galssInfo.isEmpty()){
			Map<String, Object> item=new HashMap<>();//新格式编排
			List<Map<String, Object>> galssInfo = groupBy.get(key);//当前钢化版图内玻璃小片集合
			if (!galssInfo.isEmpty()) {
			Map<String, Object> item = new HashMap<>();//新格式编排
			//以下为同层 {key:"groupBy.get(key)",olLayoutRate:"小片集合"}
			// {key:"groupBy.get(key)",olLayoutRate:[{},{},{},{}]}


			item.put("listGlass",groupBy.get(key));
			item.put("LayoutId",key);
			item.put("olWidth",galssInfo.get(0).get("olWidth").toString());
			item.put("olHeight",galssInfo.get(0).get("olHeight").toString());
			item.put("olLayoutRate",galssInfo.get(0).get("olLayoutRate").toString());
			item.put("listGlass", groupBy.get(key));
			item.put("LayoutId", key);
			item.put("olWidth", galssInfo.get(0).get("olWidth").toString());
			item.put("olHeight", galssInfo.get(0).get("olHeight").toString());
			item.put("olLayoutRate", galssInfo.get(0).get("olLayoutRate").toString());
			result.add(item);
			}else{
			log.info("当前钢化版图不存在小片数据请检查，版图号:{}"+key);
			return null ;
			} else {
			log.info("当前钢化版图不存在小片数据请检查，版图号:{}" + key);
			return null;
			}
			}
			}
			@@ -523,4 +523,9 @@
			}
			return false;
			}

			@Override
			public EdgStorageCageDetails queryEdgStorageDetailsBySize(double width, double height) {
			return baseMapper.queryEdgStorageDetailsBySize(width, height);
			}
			}