YiWuProject.git

			@@ -4,9 +4,12 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.mapper.GlassInfoMapper;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			@@ -25,6 +28,8 @@
			public class TemperingGlassInfoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {
			@Resource
			TemperingGlassInfoMapper temperingMapper;
			@Autowired
			private GlassInfoMapper glassInfoMapper;

			@Override
			public List<TemperingGlassInfo> selectWaitingGlass() {
			@@ -132,4 +137,23 @@
			}
			return result;
			}

			@Override
			public GlassInfo selectTempering(GlassInfo glassInfo) {

			QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
			wrapper.select("max(tempering_layout_id)as id")
			.eq("engineer_id", glassInfo.getEngineerId());

			return glassInfoMapper.selectOne(wrapper);
			}

			@Override
			public List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo) {
			QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
			wrapper.eq("engineer_id", glassInfo.getEngineerId())
			.eq("tempering_layout_id", glassInfo.getTemperingLayoutId())
			.select("engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,glass_id");
			return glassInfoMapper.selectList(wrapper);
			}
			}