jinling.yang c3e5610b17 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化sf ...

# Conflicts:
#	sf_manufacturing/models/__init__.py
#	sf_manufacturing/models/mrp_workcenter.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_manufacturing/views/mrp_workorder_view.xml

2023-01-09 20:33:53 +08:00

..

controllers

优化sf获取cnc程序和ftp

2023-01-09 19:54:02 +08:00

models

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化sf

2023-01-09 20:33:53 +08:00

views

修改胚料部分

2022-12-09 17:23:07 +08:00

__init__.py

212

2022-11-21 20:04:56 +08:00

__manifest__.py

修改胚料部分

2022-12-09 17:23:07 +08:00