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

# Conflicts:
#	sf_base/views/base_view.xml
#	sf_base/views/common_view.xml
#	sf_tool_management/models/base.py

2023-08-17 18:09:19 +08:00

..

__init__.py

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

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

base.py

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

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

common.py

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

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

fixture.py

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

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

functional_fixture.py

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_base_new.py

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

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

tool_base.py

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

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