Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

ZengTao

2024-11-01 7ac0936473cfa23ed0fcb3290d2d12fda1ba2411

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java

@@ -95,11 +95,16 @@
    }

    @Override
    public  Engineering selectInitiate(Integer state) {
    public Engineering selectInitiate(Integer state) {
        //查询是否有开始上片的工程任务
        QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
            wrapper.eq("state", state);
        return this.getOne(wrapper);
        wrapper.eq("state", state);
        return engineeringMapper.selectOne(wrapper);
    }

    @Override
    public Engineering selectUpInitiate(Integer state, Integer equipmentId) {
        return null;
    }

    @Override