gqh 257ed593c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop ...

# Conflicts:
#	sf_dlm/data/product_data.xml
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_mrs_connect/controllers/controllers.py

2022-12-12 14:52:48 +08:00

..

__init__.py

更改制造模块名

2022-11-22 09:41:52 +08:00

model_type.py

修改cnc编程单

2022-11-25 10:56:37 +08:00

mrp_maintenance.py

更改制造模块名

2022-11-22 09:41:52 +08:00

mrp_production.py

优化odoo16工单视图展示问题

2022-12-12 14:46:54 +08:00

mrp_routing_workcenter.py

修改胚料部分

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

mrp_workcenter.py

cnc获取

2022-11-22 21:18:15 +08:00

mrp_workorder.py

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

2022-12-12 14:52:48 +08:00

stock.py

优化odoo16工单视图展示问题

2022-12-12 14:46:54 +08:00

tray.py

更改制造模块名

2022-11-22 09:41:52 +08:00