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

从ftp获取cnc程序文件

2022-11-30 11:25:37 +08:00

ftp_operate.py

代码规范整理，产品页面模型和胚料的模型类型字段做显示

2023-02-09 15:26:08 +08:00

res_config_setting.py

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

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

sync_common.py

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

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