From 0347eb48e43dcdd3924f2f67e4795ec6b5ea4220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Tue, 25 Mar 2025 13:48:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E8=A1=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=A4=E6=9C=9F=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=BE=9B=E8=B4=A7?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=BE=85=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/sale_order_views.xml | 2 +-
 sf_sale/models/sale_order.py                | 3 +++
 sf_sale/views/sale_order_view.xml           | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/views/sale_order_views.xml b/sf_manufacturing/views/sale_order_views.xml
index 10700231..7bda0168 100644
--- a/sf_manufacturing/views/sale_order_views.xml
+++ b/sf_manufacturing/views/sale_order_views.xml
@@ -71,7 +71,7 @@
 
     <record id="sale.action_quotations_with_onboarding" model="ir.actions.act_window">
         <field name="search_view_id" ref="jikimo_sale_order_view_search_inherit_quotation_supply_method"/>
-        <field name="context">{'search_default_draft': 1}</field>
+        <field name="context">{'search_default_supply_method': 1}</field>
     </record>
 
     <record id="action_quotations_supply_method" model="ir.actions.act_window">
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 09dc24dd..1c8480dd 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -150,6 +150,7 @@ class ReSaleOrder(models.Model):
             'is_incoming_material': True if item.get('embryo_redundancy_id') else False,
             'manual_quotation': item.get('manual_quotation'),
             'model_id': item['model_id'],
+            'delivery_end_date': item['delivery_end_date'],
         }
         return self.env['sale.order.line'].with_context(skip_procurement=True).create(vals)
 
@@ -272,6 +273,8 @@ class ResaleOrderLine(models.Model):
     model_url = fields.Char('模型文件地址')
     model_id = fields.Char('模型id')
 
+    delivery_end_date = fields.Date('交货截止日期')
+
     @api.depends('embryo_redundancy_id')
     def _compute_is_incoming_material(self):
         for line in self:
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 6a5f839b..704f9e5e 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -136,6 +136,10 @@
                 <xpath expr="//field[@name='order_line']/tree/field[@name='product_uom']" position="attributes">
                     <attribute name="optional">hide</attribute>
                 </xpath>
+                <xpath expr="//field[@name='order_line']/tree/field[@name='remark']" position="before">
+                    <field name="delivery_end_date" optional="hide"/>
+                </xpath>
+                
                 <field name="user_id" position="attributes">
                     <attribute name="attrs">{'readonly': [('state', 'in', ['cancel','sale'])]}</attribute>
                 </field>