jinling.yang 14edbd85f4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） ...

# Conflicts:
#	sf_base/models/tool_base.py
#	sf_base/models/tool_base_new.py
#	sf_maintenance/views/maintenance_views.xml
#	sf_mrs_connect/models/res_config_setting.py

2023-10-19 10:53:03 +08:00

..

__init__.py

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

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

sf_equipment_maintenance_standards.py

修改维保生成编码和名称的规则

2023-09-26 17:29:14 +08:00

sf_maintenance_logs.py

处理机床能力数据

2023-09-13 14:32:32 +08:00

sf_maintenance_requests.py

维保计划关联维保项目

2023-09-14 10:55:43 +08:00

sf_maintenance.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）

2023-10-19 10:53:03 +08:00