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

# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py

2023-08-08 17:18:06 +08:00

..

__init__.py

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

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

base.py

修改设备参数以及机床型号基础参数以及同步cloud方法

2023-08-07 16:00:26 +08:00

common.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协

2023-04-21 15:40:03 +08:00

fixture_base.py

处理冲突

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

fixture.py

新增采购入库时实时注册夹具产品到cloud

2023-08-04 17:33:21 +08:00

functional_fixture.py

新增功能夹具接口

2023-08-02 17:35:09 +08:00

tool_base_new.py

修改功能刀具模块继承方式

2023-07-20 09:17:21 +08:00

tool_base.py

Accept Merge Request #205: (feature/sf刀具基础信息管理 -> develop)

2023-06-27 16:27:32 +08:00