YiWuProject.git

			@@ -30,12 +30,16 @@
			public List<TemperingGlassInfo> selectWaitingGlass() {
			//获取等待进炉中的玻璃信息
			QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
			wrapper.select("Top 1 *").eq("state",1);
			wrapper.select("Top 1 *").in("state",1,0);
			TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);
			QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
			glassinfo.eq("engineer_id",glass.getEngineerId())
			.eq("tempering_layout_id", glass.getTemperingLayoutId());
			return temperingMapper.selectList(glassinfo);
			if(glass!=null) {
			QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
			glassinfo.eq("engineer_id", glass.getEngineerId())
			.eq("tempering_layout_id", glass.getTemperingLayoutId());
			return temperingMapper.selectList(glassinfo);
			}else {
			return null;
			}
			}

			@Override
			@@ -55,11 +59,14 @@
			wrap.select("Top 1 *").eq("state",3);
			TemperingGlassInfo glass=temperingMapper.selectOne(wrap);
			//根据工程号和版图获取数据
			QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
			wapper.eq("engineer_id",glass.getEngineerId())
			.eq("tempering_layout_id", glass.getTemperingLayoutId())
			.orderByAsc("tempering_layout_id","tempering_feed_sequence");
			return temperingMapper.selectList(wapper);
			if(glass != null) {
			QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
			wapper.eq("engineer_id", glass.getEngineerId())
			.eq("tempering_layout_id", glass.getTemperingLayoutId())
			.orderByAsc("tempering_layout_id", "tempering_feed_sequence");
			return temperingMapper.selectList(wapper);
			}
			return null;
			}

			@Override