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

2024-11-26 16:04:10 +08:00
parent b5beaad7bf 5ccc836b20
commit d91c7b22d7
7 changed files with 13 additions and 6 deletions
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -141,8 +141,8 @@ class ResMrpWorkOrder(models.Model):

    # 是否绑定托盘
    is_trayed = fields.Boolean(string='是否绑定托盘', default=False)
-
    tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)
+
    technology_design_id = fields.Many2one('sf.technology.design')

    def _compute_default_construction_period_status(self):