wuyouming666
2024-06-14 3123dbd3a5be75999f368fbe4aa722e3877074ab
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
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);
    }
@@ -53,12 +54,24 @@
    }
    @Override
    public TemperingGlassInfo selectOverGlass() {
        //获取过旋转台的玻璃
    public List<TemperingGlassInfo> selectOverGlass() {
        //获取过旋转台最大的钢化版图id
        QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
        wapper.select("top 1 *").eq("state", 4)
                .orderByAsc("tempering_layout_id")
                .orderByDesc("tempering_feed_sequence");
        return temperingMapper.selectOne(wapper);
                .orderByDesc("tempering_layout_id");
        //根据最大的版图id显示钢化后的版图信息
        TemperingGlassInfo glassinfo= temperingMapper.selectOne(wapper);
        QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
        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);
    }
}