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

# Conflicts:
#	sf_mrs_connect/models/sync_common.py

2023-10-11 17:41:19 +08:00

..

__init__.py

刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块；新增每齿走刀量模型；整体式刀具物料新增关联每齿走刀量对象字段；

2023-09-08 10:20:52 +08:00

base.py

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

2023-08-29 15:48:48 +08:00

common.py

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

2023-10-11 17:41:19 +08:00

fixture.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理

2023-08-29 11:21:13 +08:00

functional_fixture.py

去掉警告

2023-08-29 10:22:12 +08:00

tool_base_new.py

撤销制造-配置-刀具型号新增的参数；对产品刀具物料字段的限制优化

2023-09-06 16:48:07 +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