修改配送类型的字段关联形式，修改工件配送列表页的默认筛选条件

sf_manufacturing/models/agv_scheduling.py

@@ -19,12 +19,8 @@ class AgvScheduling(models.Model):
     _order = 'id desc'
 
     name = fields.Char('任务单号', index=True, copy=False)
-
-    def _get_agv_route_type_selection(self):
-        return self.env['sf.agv.task.route'].fields_get(['route_type'])['route_type']['selection']
-
-    agv_route_type = fields.Selection(selection=_get_agv_route_type_selection, string='任务类型', required=True)
     agv_route_id = fields.Many2one('sf.agv.task.route', '任务路线')
+    agv_route_type = fields.Selection(related='agv_route_id.route_type', string='任务类型', required=True)
     start_site_id = fields.Many2one('sf.agv.site', '起点接驳站', required=True)
     end_site_id = fields.Many2one('sf.agv.site', '终点接驳站', tracking=True)
     site_state = fields.Selection([

sf_manufacturing/models/mrp_workorder.py

@@ -1859,11 +1859,7 @@ class WorkPieceDelivery(models.Model):
     feeder_station_destination_id = fields.Many2one('sf.agv.site', '目的接驳站')
     task_delivery_time = fields.Datetime('任务下发时间')
     task_completion_time = fields.Datetime('任务完成时间')
-
+    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']
-
-    type = fields.Selection(selection=_get_agv_route_type_selection, string='类型')
     delivery_duration = fields.Float('配送时长', compute='_compute_delivery_duration')
     status = fields.Selection(
         [('待下发', '待下发'), ('已下发', '待配送'), ('已配送', '已配送'), ('已取消', '已取消')], string='状态',

sf_manufacturing/views/mrp_workorder_view.xml

@@ -785,6 +785,10 @@
                 <filter name="filter_to_be_issued" string="待下发" domain="[('status', 'in', ['待下发'])]"/>
                 <filter name="filter_issued" string="已下发" domain="[('status', 'in', ['已下发'])]"/>
                 <filter name="filter_delivered" string="已配送" domain="[('status', 'in', ['已配送'])]"/>
+                <separator/>
+                <filter name="filter_type_to_production_line" string="上产线" domain="[('type', '=', '上产线')]"/>
+                <filter name="filter_type_to_empty_racks" string="运送空料架" domain="[('type', '=', '运送空料架')]"/>
+                <filter name="filter_type_production_line_back" string="下产线" domain="[('type', '=', '下产线')]"/>
                 <field name="rfid_code"/>
                 <field name="production_id"/>
                 <field name="feeder_station_start_id"/>
@@ -807,7 +811,7 @@
         <field name="res_model">sf.workpiece.delivery</field>
         <field name="search_view_id" ref="sf_workpiece_delivery_search"/>
         <field name="context">{'search_default_filter_to_be_issued': 1,
-            'search_default_filter_issued': 1}
+            'search_default_filter_type_to_production_line': 1}
         </field>
         <field name="view_mode">tree,form</field>
         <field name="domain">

sf_manufacturing/wizard/workpiece_delivery_wizard.py

@@ -54,10 +54,7 @@ class WorkpieceDeliveryWizard(models.TransientModel):
                     }
             }
 
-    def _get_agv_route_type_selection(self):
+    delivery_type = fields.Selection(related='route_id.route_type', string='类型')
-        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: