~zhoushihao/YiWuProject.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);
			}

			@@ -86,4 +86,16 @@
			.groupBy("state");
			return temperingMapper.selectList(wrapper);
			}

			@Override
			public Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo) {
			QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
			wrapper.eq("glass_id",temperingGlassInfo.getGlassId())
			.lt("state",5);
			if (temperingMapper.update(temperingGlassInfo,wrapper) > 0) {
			return 200;
			}else {
			return 100;
			}
			}
			}