Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程

# Conflicts: # sf_manufacturing/models/mrp_workorder.py
2024-05-11 00:20:08 +08:00
parent 2bffc5964a 7d7096a36c
commit ec01b89242
6 changed files with 28 additions and 6 deletions
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -67,7 +67,7 @@ class MrpProduction(models.Model):
        ('待加工', '待加工'),
        ('待解除装夹', '待解除装夹'),
        ('已完工', '已完工'),
-    ], string='工序状态', related='workorder_ids.process_state', store=True)
+    ], string='工序状态')

    # 零件图号
    part_number = fields.Char('零件图号')