YiWuProject.git

File was renamed from hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
			@@ -4,11 +4,11 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
			import com.mes.temperingglass.mapper.TemperingMapper;
			import com.mes.temperingglass.service.TemperingAgoService;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import com.github.yulichang.base.MPJBaseServiceImpl;

			import java.util.List;

			/**
			@@ -23,7 +23,7 @@
			@DS("salve_hangzhoumes")
			public class TemperingAgoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingAgoService {
			@Autowired
			TemperingMapper temperingMapper;
			TemperingGlassInfoMapper temperingMapper;

			@Override
			public List<TemperingGlassInfo> selectWaitingGlass() {
			@@ -35,10 +35,11 @@
			}

			@Override
			public List<TemperingGlassInfo> selectIntoGlass() {
			public List<TemperingGlassInfo> selectIntoGlass(int layoutId) {
			//获取进炉中的玻璃信息
			QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
			wrapper.eq("state",2)
			.eq("tempering_layout_id", layoutId)
			.orderByAsc("tempering_layout_id","tempering_feed_sequence");
			return temperingMapper.selectList(wrapper);
			}
			@@ -64,4 +65,13 @@
			wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId());
			return temperingMapper.selectList(wrapper);
			}

			@Override
			public List<TemperingGlassInfo> selectLayoutId() {
			QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
			wrapper.select("distinct tempering_layout_id")
			.eq("state",2)
			.orderByAsc("tempering_layout_id");
			return temperingMapper.selectList(wrapper);
			}
			}