~zhoushihao/YiWuProject.git

			@@ -4,8 +4,11 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.query.MPJQueryWrapper;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.entity.LoadGlassInfo;
			import com.mes.glassinfo.mapper.GlassInfoMapper;
			import com.mes.largenscreen.entity.PieChartVO;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			@@ -24,7 +27,7 @@
			* @since 2024-04-07
			*/
			@Service
			@DS("salve_northGlassMes")
			@DS("north_glass_mes")
			public class TemperingGlassInfoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {
			@Resource
			TemperingGlassInfoMapper temperingMapper;
			@@ -69,7 +72,8 @@
			public List<TemperingGlassInfo> selectOutGlass() {
			//获取出炉中的玻璃信息
			QueryWrapper<TemperingGlassInfo> wrap = new QueryWrapper<>();
			wrap.select("Top 1 *").eq("state", 3);
			wrap.select("Top 1 *").eq("state", 4)
			.orderByDesc("id");
			TemperingGlassInfo glass = temperingMapper.selectOne(wrap);
			//根据工程号和版图获取数据
			if (glass != null) {
			@@ -83,7 +87,7 @@
			//获取过旋转台最大的钢化版图id
			QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
			wapper.select("Top 1 *").eq("state", 4)
			.orderByDesc("tempering_layout_id,engineer_id");
			.orderByDesc("id");
			//根据最大的版图id显示钢化后的版图信息
			TemperingGlassInfo glassinfo = temperingMapper.selectOne(wapper);
			if (glassinfo == null) {
			@@ -149,11 +153,24 @@
			}

			@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);
			public List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo) {
			List<LoadGlassInfo> glassInfos = null;
			glassInfos = glassInfoMapper.selectJoinList(LoadGlassInfo.class, new MPJQueryWrapper<GlassInfo>()
			.select("IFNULL(b.state, 0) AS state,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id,t.flow_card_id")
			.leftJoin("(SELECT glass_id, MAX(type) AS state FROM damage GROUP BY glass_id) b\n" +
			"ON t.glass_id = b.glass_id")
			.eq("engineer_id", glassInfo.getEngineerId())
			.eq("tempering_layout_id", glassInfo.getTemperingLayoutId()));
			return glassInfos;
			// 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);
			}

			@Override
			public List<PieChartVO> queryPieChart() {
			return baseMapper.queryPieChart();
			}
			}