1、卧理单条磨边线对接完成，另一条线等待IP确认 2、大理片笼提交部分代码

zhoushihao

2024-11-11 21092d29c1c0cd1003bb32bf91fddae265a8baea

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

@@ -40,12 +40,13 @@
        LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
        pauseWrapper.set(Engineering::getState,0);
        pauseWrapper.eq(Engineering::getState,1);
        pauseWrapper.update();
        boolean pause = pauseWrapper.update();
        //使用projectId作为条件开始工程
        LambdaUpdateChainWrapper<Engineering> wrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
        wrapper.set(Engineering::getState,state);
        wrapper.eq(Engineering::getEngineerId,projectId);
        return  wrapper.update();
        wrapper.update();
        return pause;
    }

    @Override
@@ -94,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
@@ -109,4 +115,18 @@
        return engineeringMapper.selectList(wrapper);
    }

    @Override
    public boolean pauseTask(String engineerId, Integer state) {
        //暂停正在进行工程
        LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
        pauseWrapper.set(Engineering::getState, 0);
        pauseWrapper.eq(Engineering::getState, 1);
        return pauseWrapper.update();
    }

    @Override
    public boolean changeTask(String engineerId, Integer state, Integer filmRemove, Integer stationCell) {
        return false;
    }

}