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

sf_manufacturing/models/agv_scheduling.py

@@ -50,6 +50,21 @@ class AgvScheduling(models.Model):
 
     delivery_workpieces = fields.Char('配送工件', compute=_compute_delivery_workpieces)
 
+    @api.model
+    def web_search_read(self, domain=None, fields=None, offset=0, limit=None, order=None, count_limit=None):
+        domain = domain or []
+        new_domain = []
+        for index, item in enumerate(domain):
+            if isinstance(item, list):
+                if item[0] == 'delivery_workpieces':
+                    new_domain.append('&')
+                    new_domain.append(['workorder_ids.production_id.name', item[1], item[2]])
+                    new_domain.append(['agv_route_type', '!=', '运送空料架'])
+                    continue
+            new_domain.append(item)
+
+        return super(AgvScheduling, self).web_search_read(new_domain, fields, limit=limit, offset=offset)
+
     @api.depends('task_completion_time', 'task_delivery_time')
     def _compute_task_duration(self):
         for rec in self:
@@ -73,6 +88,7 @@ class AgvScheduling(models.Model):
                 agv_route_type: AGV任务类型
                 workorders: 工单
         """
+        _logger.info('创建AGV调度任务\r\n起点为【%s】，任务类型为【%s】，工单为【%s】' % (agv_start_site_name, agv_route_type, workorders))
         if not workorders:
             raise UserError(_('工单不能为空'))
         agv_start_site = self.env['sf.agv.site'].sudo().search([('name', '=', agv_start_site_name)], limit=1)