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

ZengTao

2024-12-16 2c0efecea0ed579ce66b69548d9c02e76e56d1f1

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

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

    @Override
@@ -119,4 +119,12 @@
        return  pauseWrapper.update();
    }

    @Override
    public boolean deleteTask(String engineerId) {
        //删除工程表
        QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
        wrapper.eq("engineer_id", engineerId);
        return this.remove(wrapper);
    }

}