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

# Conflicts:
#	sf_base/views/base_view.xml
#	sf_mrs_connect/models/sync_common.py

2023-08-18 14:34:37 +08:00

..

base_view.xml

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

2023-08-18 14:34:37 +08:00

common_view.xml

刀具页面优化

2023-08-18 11:37:30 +08:00

fixture_view.xml

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

2023-08-17 18:03:12 +08:00

functional_fixture_view.xml

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

2023-08-15 17:31:49 +08:00

ir_cron_mrs.xml

新增夹具和功能夹具，及同步mrs的夹具和功能夹具

2023-06-26 18:07:44 +08:00

menu_fixture_view.xml

优化装夹工单，新增工件装夹page，名字为组件的page名称改为物料，去掉单独的工件装夹功能

2023-07-13 16:57:48 +08:00

menu_view.xml

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

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

tool_base_menu.xml

处理冲突

2023-06-16 10:02:33 +08:00

tool_base_views.xml

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

2023-08-15 17:31:49 +08:00

tool_menu.xml

制造模块里的配置内的页面优化

2023-08-03 16:57:18 +08:00

tool_views.xml

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

2023-08-17 18:03:12 +08:00