Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协

# Conflicts: # sf_dlm/__manifest__.py # sf_dlm/models/product_template.py # sf_manufacturing/models/mrp_production.py
2023-04-21 15:40:03 +08:00
parent 32d53df8ec 3cfc2b5957
commit 2acdbca2b1
1375 changed files with 517284 additions and 5406 deletions
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -338,8 +338,8 @@ class MrpProduction(models.Model):
                current_sequence += 1
                if work.name == '获取CNC加工程序':
                    work.button_start()
-                    # work.button_finish()
-                    # work.fetchCNC()
+                    work.button_finish()
+                    work.fetchCNC()

    # 创建工单并进行排序
    def _create_workorder(self):