From d5c82e4a28bbb80e7f5524aa5e82b654b27e8ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Wed, 11 Sep 2024 10:40:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/agv_scheduling.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sf_manufacturing/models/agv_scheduling.py b/sf_manufacturing/models/agv_scheduling.py
index f758abd9..a18dc5ef 100644
--- a/sf_manufacturing/models/agv_scheduling.py
+++ b/sf_manufacturing/models/agv_scheduling.py
@@ -1,10 +1,10 @@
+
+import logging
 import requests
 
 from odoo import models, fields, api, _
 from odoo.exceptions import UserError
 
-import logging
-
 _logger = logging.getLogger(__name__)
 
 
@@ -54,7 +54,7 @@ class AgvScheduling(models.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):
+        for item in domain:
             if isinstance(item, list):
                 if item[0] == 'delivery_workpieces':
                     new_domain.append('&')
@@ -63,7 +63,7 @@ class AgvScheduling(models.Model):
                     continue
             new_domain.append(item)
 
-        return super(AgvScheduling, self).web_search_read(new_domain, fields, limit=limit, offset=offset)
+        return super(AgvScheduling, self).web_search_read(new_domain, fields, offset, limit, order, count_limit)
 
     @api.depends('task_completion_time', 'task_delivery_time')
     def _compute_task_duration(self):

From e1093a3c696fd1205edf2fd190b8ec2545fb6f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Sat, 14 Sep 2024 13:42:38 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84js=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/__manifest__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index 8cf16106..35501367 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -45,7 +45,6 @@
             'sf_manufacturing/static/src/scss/kanban_change.scss',
             'sf_manufacturing/static/src/xml/button_show_on_tree.xml',
             'sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js',
-            'sf_manufacturing/static/src/js/custom_barcode_handlers.js',
         ]
 
     },

From cc3289c834e27e8445ff46039a260d8a0aadef7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Sat, 14 Sep 2024 13:49:46 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=86=E5=B7=A5=E4=BB=B6=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E9=A1=B5=E9=9D=A2=E8=B5=B7=E7=82=B9=E6=8E=A5=E9=A9=B3?=
 =?UTF-8?q?=E7=AB=99=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=BD=93=E5=89=8D=E6=8E=A5?=
 =?UTF-8?q?=E9=A9=B3=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/wizard/workpiece_delivery_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/wizard/workpiece_delivery_views.xml b/sf_manufacturing/wizard/workpiece_delivery_views.xml
index e895d39e..a83a371a 100644
--- a/sf_manufacturing/wizard/workpiece_delivery_views.xml
+++ b/sf_manufacturing/wizard/workpiece_delivery_views.xml
@@ -14,7 +14,7 @@
                     <group col="1">
                         <field name="production_ids" readonly="1" widget="many2many_tags" string="制造订单号"/>
                         <field name="delivery_type" readonly="1"/>
-                        <field name="feeder_station_start_id" options="{'no_create': True}" required="1"/>
+                        <field name="feeder_station_start_id" string="当前接驳站" options="{'no_create': True}" required="1"/>
                         <field name="workcenter_id" options="{'no_create': True}"/>
                     </group>
                     <footer>