blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
wangfei
2024-12-12 425e9e1f5413fdd46368e5486d582a25473f7476 
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java


@@ -2,6 +2,7 @@




import com.baomidou.dynamic.datasource.annotation.DS;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.mes.temperingglass.entity.TemperingGlassInfo;


import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;


import com.mes.temperingglass.service.TemperingGlassInfoService;


@@ -9,6 +10,7 @@


import org.springframework.stereotype.Service;


import com.github.yulichang.base.MPJBaseServiceImpl;




import javax.annotation.Resource;


import java.util.List;




/**


@@ -22,16 +24,21 @@


@Service


@DS("salve_hangzhoumes")


public class TemperingGlassInfoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {


    @Autowired


    @Resource


    TemperingGlassInfoMapper temperingMapper;




    @Override


    public List<TemperingGlassInfo> selectWaitingGlass() {


        //获取等待进炉中的玻璃信息


        QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();


        wrapper.select("Top 1 *").in("state",1,0);


        wrapper.select("Top 1 *").in("state", 1, 0).orderByDesc("id");




        TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);


        if(glass!=null) {


            this.update(new LambdaUpdateWrapper<TemperingGlassInfo>().set(TemperingGlassInfo::getState, 2).in(TemperingGlassInfo::getState, 0, 1)


                    .and(e -> e.ne(TemperingGlassInfo::getEngineerId, glass.getEngineerId())


                            .or(e1 -> e1.eq(TemperingGlassInfo::getEngineerId, glass.getEngineerId())


                                    .ne(TemperingGlassInfo::getTemperingLayoutId, glass.getTemperingLayoutId()))));


            QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();


            glassinfo.eq("engineer_id", glass.getEngineerId())


                    .eq("tempering_layout_id", glass.getTemperingLayoutId());


@@ -110,8 +117,7 @@


    }




    @Override


    public List<TemperingGlassInfo> selectGlassInfoById(Integer id)


    {


    public List<TemperingGlassInfo> selectGlassInfoById(Integer id) {


        List<TemperingGlassInfo> result=null;


        QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();


        wrapper.select("Top 1 *").in("state",1,0).eq("tempering_layout_id",id);