From 5365211f494d508007812b7492e7fd47842679d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Wed, 13 Nov 2024 10:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/product_data.xml                     |  5 ++--
 .../models/sale_order.py                      |  7 ++++--
 .../views/sale_order_views.xml                | 23 +++++++++++++++----
 .../product_template_management_view.xml      |  3 +++
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/jikimo_sale_multiple_supply_methods/data/product_data.xml b/jikimo_sale_multiple_supply_methods/data/product_data.xml
index 40c8ca63..43c8bfba 100644
--- a/jikimo_sale_multiple_supply_methods/data/product_data.xml
+++ b/jikimo_sale_multiple_supply_methods/data/product_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <data noupdate="1">
+    <data noupdate="0">
         <record id="product_product_manual_processing" model="product.product">
             <field name="name">人工线下加工模板</field>
             <field name="active" eval="False"/>
@@ -82,8 +82,7 @@
             <field name="seller_ids" eval="[ref('jikimo_sale_multiple_supply_methods.product_supplierinfo_bfm')]"/>
         </record>
 
-        <record id="product_embryo_sf_self_machining" model="product.product">
-            <field name="name">坯料加工模板（人工线下加工）</field>
+        <record id="sf_dlm.product_embryo_sf_self_machining" model="product.product">
             <field name="is_manual_processing">true</field>
         </record>
     </data> 
diff --git a/jikimo_sale_multiple_supply_methods/models/sale_order.py b/jikimo_sale_multiple_supply_methods/models/sale_order.py
index 822958ec..8da34134 100644
--- a/jikimo_sale_multiple_supply_methods/models/sale_order.py
+++ b/jikimo_sale_multiple_supply_methods/models/sale_order.py
@@ -21,9 +21,12 @@ class SaleOrder(models.Model):
         self.state = 'supply method'
 
     def action_confirm(self):
+        # 判断是否所有产品都选择了供货方式
+        filter_line = self.order_line.filtered(lambda line: not line.supply_method)
+        if filter_line:
+            raise UserError('当前订单内（%s）产品未选择路线，请选择后重试' % ','.join(filter_line.mapped('product_id.name')))
+
         for line in self.order_line:
-            if not line.supply_method:
-                raise UserError('请先选择供货方式')
             bom_type = ''
             # 根据供货方式修改成品模板
             if line.supply_method == 'automation':
diff --git a/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml b/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml
index c5a1766c..afe3ad75 100644
--- a/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml
+++ b/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml
@@ -22,7 +22,7 @@
                 <attribute name="name">confirm_to_supply_method</attribute>
             </xpath>
             <xpath expr="//header/button[@name='confirm_to_supply_method']" position="before">
-                <button name="action_confirm" string="供货方式确认" type="object" attrs="{'invisible': [('state', '!=', 'supply method')]}" />
+                <button name="action_confirm" string="供货方式确认" type="object" attrs="{'invisible': [('state', '!=', 'supply method')]}" confirm="您确定要确认供货方式吗？"/>
             </xpath>
             <xpath expr="//header/field[@name='state']" position="attributes">
                 <attribute name="statusbar_visible">draft,sent,supply method,sale</attribute>
@@ -30,6 +30,15 @@
             <xpath expr="//page/field[@name='order_line']/tree/field[@name='remark']" position="before">
                 <field name="supply_method" attrs="{'invisible': [('state', '=', 'draft')], 'required': [('state', '=', 'supply method')]}" />
             </xpath>
+            <xpath expr="//header/button[@name='action_cancel']" position="attributes">
+                <attribute name="attrs">{'invisible': [('state', '!=', 'draft')]}</attribute>
+            </xpath>
+            <xpath expr="//header/button[@name='action_cancel']" position="attributes">
+                <attribute name="attrs">{'invisible': [('state', '!=', 'draft')]}</attribute>
+            </xpath>
+            <xpath expr="//header/button[@name='action_quotation_send'][5]" position="attributes">
+                <attribute name="attrs">{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel','supply method']),'&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel','supply method'])]}</attribute>
+            </xpath>
         </field>
     </record>
 
@@ -39,8 +48,11 @@
         <field name="mode">primary</field>
         <field name="inherit_id" ref="sale.sale_order_view_search_inherit_quotation"/>
         <field name="arch" type="xml">
-            <xpath expr="//filter[@name='my_quotation']" position="replace">
-                <filter string="我的报价" name="my_quotation" domain="[('state', 'in', ('draft', 'sent'))]"/>
+            <xpath expr="//filter[@name='my_quotation']" position="attributes">
+                <attribute name="domain">[('state', 'in', ('draft', 'sent')), ('user_id', '=', uid)]</attribute>
+            </xpath>
+             <xpath expr="//filter[@name='draft']" position="after">
+                <filter string="供货方式待确认" name="supply_method" domain="[('state', '=', 'supply method')]"/>
             </xpath>
         </field>
     </record>
@@ -51,8 +63,8 @@
         <field name="mode">primary</field>
         <field name="inherit_id" ref="sale.sale_order_view_search_inherit_quotation"/>
         <field name="arch" type="xml">
-            <xpath expr="//filter[@name='my_quotation']" position="replace">
-                <filter string="我的报价" name="my_quotation" domain="[('state', 'in', ('draft', 'sent'))]"/>
+            <xpath expr="//filter[@name='my_quotation']" position="attributes">
+                <attribute name="domain">[('state', 'in', ('draft', 'sent')), ('user_id', '=', uid)]</attribute>
             </xpath>
             <xpath expr="//filter[@name='draft']" position="after">
                 <filter string="供货方式待确认" name="supply_method" domain="[('state', '=', 'supply method')]"/>
@@ -69,6 +81,7 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sale.order</field>
         <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
+        <field name="view_id" ref="sale.view_quotation_tree_with_onboarding"/>
         <field name="search_view_id" ref="jikimo_sale_order_view_search_inherit_quotation_supply_method"/>
         <field name="context">{'search_default_supply_method': 1}</field>
         <field name="help" type="html">
diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index 59f2c0a1..7f0e9ad5 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -65,6 +65,9 @@
                            attrs="{'invisible': [('categ_type', '!=', '夹具')],'required': [('categ_type', '=', '夹具')]}"
                            domain="[('fixture_model_id','=',fixture_model_id)]"/>
                 </field>
+                <xpath expr="//field[@name='uom_id']" position="before">
+                    <field name="is_manual_processing" attrs="{'invisible': [('categ_type', 'not in', ['成品', '坯料'])], 'readonly': True}" />
+                </xpath>
                 <xpath expr="//label[@for='volume']" position="before">
                     <label for="length" string="尺寸"
                            attrs="{'invisible':[('product_variant_count', '>', 1), ('is_product_variant', '=', False)]}"/>