From d2395092991d99cf5548ba1d224e77abb15b9c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Wed, 9 Oct 2024 13:53:49 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=A9=BA=E6=96=99?=
 =?UTF-8?q?=E6=9E=B6=E9=85=8D=E9=80=81=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91AGV=E4=BB=BB=E5=8A=A1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py      | 3 +++
 sf_manufacturing/views/mrp_workorder_view.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 7c3ec50f..943e8ac7 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1826,6 +1826,9 @@ class WorkPieceDelivery(models.Model):
                 return is_free
             else:
                 raise UserError("接驳站暂未反馈站点实时状态，请稍后再试")
+            
+    def delivery_avg(self):
+        self._delivery_avg()
 
     # 配送至avg小车
     def _delivery_avg(self):
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index c3e05739..d0577fbc 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -797,7 +797,7 @@
                 <field name="feeder_station_start_id" readonly="1" force_save="1"/>
                 <!--                <field name="type" readonly="1"/>-->
                 <field name="feeder_station_destination_id" readonly="1" force_save="1"/>
-                <button name="button_delivery" type="object" string="配送" class="oe_highlight"/>
+                <button name="delivery_avg" type="object" string="配送" class="oe_highlight"/>
                 <button name="action_delivery_history" type="object" class="btn btn-link text-info" icon="fa-history"
                         string="历史"/>
             </tree>

From e4c845a9f65d0903889d4aa0f95cf89ec03a0b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Wed, 9 Oct 2024 14:08:38 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=A9=BA=E6=96=99?=
 =?UTF-8?q?=E6=9E=B6=E9=85=8D=E9=80=81=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91AGV=E4=BB=BB=E5=8A=A1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 943e8ac7..ab460b14 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1828,7 +1828,9 @@ class WorkPieceDelivery(models.Model):
                 raise UserError("接驳站暂未反馈站点实时状态，请稍后再试")
             
     def delivery_avg(self):
-        self._delivery_avg()
+        is_agv_task_dispatch = self.env['ir.config_parameter'].sudo().get_param('is_agv_task_dispatch')
+        if is_agv_task_dispatch:
+            self._delivery_avg()
 
     # 配送至avg小车
     def _delivery_avg(self):

From 94f57629e5e9e46b47c0574cddd90bec0d475b80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Wed, 9 Oct 2024 17:23:03 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A9=BA=E6=96=99?=
 =?UTF-8?q?=E6=9E=B6=E9=85=8D=E9=80=81=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_plan/views/view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index bfb584b8..f30cbb49 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -339,7 +339,7 @@
                 name="空料架配送"
                 sequence="11"
                 action="sf_manufacturing.sf_workpiece_delivery_empty_racks_act"
-                groups="base.group_system"
+                groups="sf_base.group_sf_order_user,sf_base.group_sf_mrp_manager,sf_base.group_sf_equipment_user"
                 parent="mrp.menu_mrp_manufacturing"
         />
         <!--         <menuitem -->

From b74bc62804ff3f6d91f5b2c37e4cea2b835d19fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Thu, 10 Oct 2024 10:49:16 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=8B=E5=8F=91AGV?=
 =?UTF-8?q?=E5=B0=8F=E8=BD=A6=E4=BB=BB=E5=8A=A1=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?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/mrp_workorder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index ab460b14..7887f08c 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -1891,7 +1891,7 @@ class WorkPieceDelivery(models.Model):
                             logging.info('delivery_item-name:%s' % delivery_item.name)
                             delivery_item.write({
                                 'task_delivery_time': fields.Datetime.now(),
-                                'status': '待配送'
+                                'status': '已下发'
                             })
                             if delivery_item.type == "上产线":
                                 delivery_item.workorder_id.write({'is_delivery': True})