Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

2025-02-24 14:46:35 +08:00
parent 555802b271 4002588eec
commit 9e25657fea
15 changed files with 295 additions and 140 deletions
--- a/sf_manufacturing/wizard/workpiece_delivery_wizard.py
+++ b/sf_manufacturing/wizard/workpiece_delivery_wizard.py
@@ -54,7 +54,9 @@ class WorkpieceDeliveryWizard(models.TransientModel):
                    }
            }

-    delivery_type = fields.Selection(related='route_id.route_type', string='类型')
+    def _get_agv_route_type_selection(self):
+        return self.env['sf.agv.task.route'].fields_get(['route_type'])['route_type']['selection']
+    delivery_type = fields.Selection(selection=_get_agv_route_type_selection, string='类型')

    def dispatch_confirm(self):
        if len(self.workorder_ids) < 4: