Commit Graph

57 Commits

Author SHA1 Message Date
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
gqh
e0a0b3d411 优化odoo16工单视图展示问题 2022-12-12 14:46:54 +08:00
jinling.yang
5e2d75b23e 修改胚料部分 2022-12-09 17:23:07 +08:00
jinling.yang
b498637154 修改cnc编程单 2022-11-25 10:56:37 +08:00
jinling.yang
11a360222e cnc获取 2022-11-22 21:18:15 +08:00
jinling.yang
3cbd1140bb mrs为名的更改为sf 2022-11-22 10:20:18 +08:00
jinling.yang
830f3bb35e 212 2022-11-21 20:04:56 +08:00