qihao.gong@jikimo.com f31a6d0d43 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug ...

# Conflicts:
#	sf_maintenance/views/maintenance_views.xml

2023-08-24 15:00:41 +08:00

..

models

优化机场看板以及机床表单

2023-08-17 11:11:47 +08:00

security

将生产线模型从设备模块搬移到了制造模块，新增工作日历设置修改休息日字段则工作日历创建新记录

2023-07-13 16:05:38 +08:00

tests

处理设备与设备维保标准的关联关系方法，新增设备故障报警日志页面

2023-06-27 17:32:24 +08:00

views

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

2023-08-24 15:00:41 +08:00

__init__.py

设备维保

2023-06-25 17:37:55 +08:00

__manifest__.py

移除托盘对象 并清除所有关联关系

2023-08-17 16:33:40 +08:00