From 9d2f23de7ca47e9e12b565548b0fc01d59724c44 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Wed, 18 Jun 2025 14:05:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8E=92=E7=A8=8B?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/sf_production_demand_plan.py         |  3 +--
 .../wizard/sf_demand_plan_print_wizard_view.xml | 17 -----------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/sf_demand_plan/models/sf_production_demand_plan.py b/sf_demand_plan/models/sf_production_demand_plan.py
index b1cbf13d..6dcf1e8b 100644
--- a/sf_demand_plan/models/sf_production_demand_plan.py
+++ b/sf_demand_plan/models/sf_production_demand_plan.py
@@ -311,7 +311,7 @@ class SfProductionDemandPlan(models.Model):
             [('name', '=', '1#CNC自动生产线')], limit=1)
         if sf_production_line:
             now = datetime.now()
-            time_part = (now + timedelta(minutes=3)).time()
+            time_part = (now + timedelta(hours=2)).time()
             date_part = fields.Date.from_string(self.planned_start_date)
             date_planned_start = datetime.combine(date_part, time_part)
             pro_plan_list.production_line_id = sf_production_line.id
@@ -326,7 +326,6 @@ class SfProductionDemandPlan(models.Model):
             'name': _("打印"),
             'domain': [('demand_plan_id', 'in', self.ids)],
             'views': [[self.env.ref('sf_demand_plan.action_plan_print_tree').id, 'list']],
-            'search_view_id': self.env.ref('sf_demand_plan.action_plan_print_search').id,
             'target': 'new',
         }
 
diff --git a/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml b/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
index 6927c283..2308538f 100644
--- a/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
+++ b/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
@@ -14,21 +14,4 @@
             </tree>
         </field>
     </record>
-
-    <record id="action_plan_print_search" model="ir.ui.view">
-        <field name="name">sf.demand.plan.print.wizard.search</field>
-        <field name="model">sf.demand.plan.print.wizard</field>
-        <field name="arch" type="xml">
-            <search>
-                <field name="type"/>
-                <filter string="图纸" name="filter_type_1" domain="[('type', '=', '1')]"/>
-                <filter string="程序单" name="filter_type_2" domain="[('type', '=', '2')]"/>
-                <filter string="图纸、程序单" name="filter_type_all" domain="[('type', 'in', ('1','2'))]"/>
-                <separator/>
-                <group expand="0" string="Group By">
-                    <filter name="group_by_type" string="类型" domain="[]" context="{'group_by': 'type'}"/>
-                </group>
-            </search>
-        </field>
-    </record>
 </odoo>
\ No newline at end of file

From 05caed1d9101fd3f0075db85f97a2c11b4867fa0 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Wed, 18 Jun 2025 14:49:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8E=92=E7=A8=8B?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_demand_plan/models/sf_production_demand_plan.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_demand_plan/models/sf_production_demand_plan.py b/sf_demand_plan/models/sf_production_demand_plan.py
index 6dcf1e8b..52dc85b9 100644
--- a/sf_demand_plan/models/sf_production_demand_plan.py
+++ b/sf_demand_plan/models/sf_production_demand_plan.py
@@ -64,7 +64,7 @@ class SfProductionDemandPlan(models.Model):
     product_uom_qty = fields.Float(
         string="需求数量",
         related='sale_order_line_id.product_uom_qty', store=True)
-    deadline_of_delivery = fields.Date('客户交期', related='sale_order_id.deadline_of_delivery', store=True)
+    deadline_of_delivery = fields.Date('客户交期', related='sale_order_line_id.delivery_end_date', store=True)
     inventory_quantity_auto_apply = fields.Float(
         string="成品库存",
         compute='_compute_inventory_quantity_auto_apply'