From 3c3ffa1ebc0c84457642aa1f42a4dea3447ef737 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 9 Jan 2024 12:01:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=982.=E4=BF=AE=E5=A4=8D=E6=B6=89=E5=8F=8A?=
 =?UTF-8?q?=E9=80=82=E5=90=88=E5=86=B7=E5=8D=B4=E6=96=B9=E5=BC=8F=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=9A=84=E7=9B=B8=E5=85=B3=E6=A8=A1=E5=9E=8B=E5=86=85?=
 =?UTF-8?q?=E8=AF=A5=E5=AD=97=E6=AE=B5=E7=9A=84=E8=BF=87=E6=BB=A4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B63.=E4=BF=AE=E6=94=B9=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E9=80=82=E5=90=88=E5=88=80=E6=9F=84=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B4.=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_base_new.py               |  4 +--
 .../product_template_management_view.xml      |  2 +-
 sf_manufacturing/models/product_template.py   | 27 +++++++++----------
 sf_sale/models/sale_order.py                  |  2 +-
 sf_sale/views/purchase_order_view.xml         |  5 ++--
 sf_sale/views/sale_order_view.xml             |  2 +-
 sf_tool_management/models/base.py             |  4 +--
 .../models/tool_material_search.py            |  4 +--
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index 1c7219bc..33d23ecb 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -89,8 +89,8 @@ class CuttingToolModel(models.Model):
                                      '柄部类型', domain=[('type', '=', '柄部类型')])
     cutting_direction_ids = fields.Many2many('maintenance.equipment.image', 'cutting_direction_library_rel',
                                              '走刀方向', domain=[('type', '=', '走刀方向')])
-    suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'suitable_coolant_library_rel',
-                                            '适合冷却液', domain=[('type', '=', '冷却液')])
+    suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'suitable_coolants_library_rel',
+                                            '适合冷却方式', domain=[('type', '=', '冷却方式')])
     compaction_way_id = fields.Many2one('maintenance.equipment.image',
                                         '压紧方式', domain=[('type', '=', '压紧方式')])
     integral_tool_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index 94cb4b7f..9ffd7462 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -338,7 +338,7 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_er_size_model"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('id', '!=', False)]}"/>
-                                <field name="cutting_tool_handle_ids" widget="many2many_tags"
+                                <field name="cutting_tool_handle_id"
                                        options="{'no_create': True}"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cooling_suit_type_ids"
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 70cfa2a0..4458ee47 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -96,8 +96,8 @@ class ResProductMo(models.Model):
     handle_type_id = fields.Many2one('maintenance.equipment.image', '柄部类型', domain=[('type', '=', '柄部类型')])
     cutting_direction_ids = fields.Many2many('maintenance.equipment.image', 'rel_cutting_product_template',
                                              '走刀方向', domain=[('type', '=', '走刀方向')])
-    suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'rel_coolant_product_template',
-                                            '适合冷却液', domain=[('type', '=', '冷却液')])
+    suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'rel_coolants_product_template',
+                                            '适合冷却方式', domain=[('type', '=', '冷却方式')])
     compaction_way_id = fields.Many2one('maintenance.equipment.image',
                                         '压紧方式', domain=[('type', '=', '压紧方式')])
 
@@ -201,7 +201,6 @@ class ResProductMo(models.Model):
                 self.feed_per_tooth_ids = self.cutting_tool_model_id.feed_per_tooth_ids.filtered(
                     lambda r: int(r.blade_diameter) == int(self.specification_id.blade_diameter))
             elif self.cutting_tool_type == '夹头':
-                self.cutting_tool_clamping_tolerance = self.specification_id.clamping_tolerance
                 self.cutting_tool_clamping_diameter_min = self.specification_id.min_clamping_diameter
                 self.cutting_tool_clamping_diameter_min = self.specification_id.max_clamping_diameter
                 self.cutting_tool_clamping_way = self.specification_id.clamping_mode
@@ -212,7 +211,7 @@ class ResProductMo(models.Model):
                 self.cutting_tool_jump_accuracy = self.specification_id.run_out_accuracy
                 self.cutting_tool_max_load_capacity = self.specification_id.max_load_capacity
                 self.cutting_tool_er_size_model = self.specification_id.er_size_model
-                self.cutting_tool_handle_ids = self.cutting_tool_model_id.handle_ids
+                self.cutting_tool_handle_id = self.cutting_tool_model_id.handle_id.id
                 self.cooling_suit_type_ids = self.specification_id.cooling_jacket
             elif self.cutting_tool_type == '刀片':
                 self.cutting_tool_total_length = self.specification_id.total_length
@@ -482,11 +481,17 @@ class ResProductMo(models.Model):
     cooling_suit_type_ids = fields.Char('适用冷却套型号')
     cutting_tool_max_load_capacity = fields.Float('最大负载能力(kg)')
     cutting_tool_er_size_model = fields.Char('尺寸型号')
-    cutting_tool_handle_ids = fields.Many2many(
+    # cutting_tool_handle_ids = fields.Many2many(
+    #     'sf.cutting_tool.standard.library',
+    #     relation='product_cutting_tool_library_chuck_handle_rel',
+    #     column1='model_id_1',
+    #     column2='model_id_2',
+    #     domain="[('cutting_tool_type', '=', '刀柄')]",
+    #     string='适用刀柄型号'
+    # )
+
+    cutting_tool_handle_id = fields.Many2one(
         'sf.cutting_tool.standard.library',
-        relation='product_cutting_tool_library_chuck_handle_rel',
-        column1='model_id_1',
-        column2='model_id_2',
         domain="[('cutting_tool_type', '=', '刀柄')]",
         string='适用刀柄型号'
     )
@@ -564,12 +569,6 @@ class ResProductMo(models.Model):
             code_arr.append(i.code)
         return code_arr
 
-    def _json_handle_item_code(self, item):
-        code_arr = []
-        for i in item.product_id.cutting_tool_handle_ids:
-            code_arr.append(i.code)
-        return code_arr
-
     def _get_ids(self, param):
         type_ids = []
         if not param:
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index f49b4906..29a9be13 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -97,7 +97,7 @@ class ReSaleOrder(models.Model):
                     raise UserError('请对【订单行】中的【计量单位】进行选择')
                 if line.price_unit == 0:
                     raise UserError('请对【订单行】中的【单价】进行输入')
-                if not line.taxes_id:
+                if not line.tax_id:
                     raise UserError('请对【订单行】中的【税】进行选择')
 
 
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index ed94be61..b22bb584 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -11,7 +11,7 @@
                 </field>
                 <field name="currency_id" position="after">
                     <field name="check_status" invisible="1"/>
-                    <!--                    <field name="state"/>-->
+<!--                    <field name="state"/>-->
                     <field name="remark" attrs="{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
                         ['pending','approved'])]}"/>
                 </field>
@@ -25,9 +25,10 @@
                 <xpath expr="//form/header/button[@name='button_confirm'][2]" position="replace">
                     <button name="button_confirm" type="object" context="{'validate_analytic': True}"
                             string="确认订单" id="draft_confirm"
+                            attrs="{'invisible': ['|','&amp;','&amp;', ('state', 'in', ['purchase']), ('check_status', 'in', ['approved']), ('date_approve', '!=', False),'&amp;', '&amp;',('state', 'in', ['purchase', 'draft']),('check_status', 'in', [False, 'pending', 'fail']),('date_approve', '=', False)]}"
                     />
                     <button name="button_confirming" type="object"
-                            string="确认"
+                            string="确认订单"
                             attrs="{'invisible': ['&amp;',('check_status','!=', False),('state', 'not in', ['draft','send'])]}"
                     />
                 </xpath>
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 8326d45f..bfbf5520 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -47,7 +47,7 @@
                   action="action_quotations_with_onboarding_inherit_sf"
                   groups="sales_team.group_sale_salesman,sf_base.group_sale_salemanager,sf_base.group_sale_director"
                   parent="sale.sale_order_menu"
-                  sequence="10"/>
+                  sequence="11"/>
 
         <record model="ir.ui.view" id="view_sale_order_form_inherit_sf">
             <field name="name">sale.order.form.inherit.sf</field>
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index f1947227..b4eb8572 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -287,8 +287,8 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
         'maintenance.equipment.image', 'rel_cutting_product_template_distribution', '走刀方向',
         domain=[('type', '=', '走刀方向')], related='sf_functional_cutting_tool_entity_ids.cutting_direction_ids')
     suitable_coolant_ids = fields.Many2many(
-        'maintenance.equipment.image', 'rel_coolant_product_template_distribution', '适合冷却方式',
-        domain=[('type', '=', '冷却液')], related='sf_functional_cutting_tool_entity_ids.suitable_coolant_ids')
+        'maintenance.equipment.image', 'rel_coolants_product_template_distribution', '适合冷却方式',
+        domain=[('type', '=', '冷却方式')], related='sf_functional_cutting_tool_entity_ids.suitable_coolant_ids')
 
     sf_functional_cutting_tool_entity_ids = fields.Many2many('sf.functional.cutting.tool.entity',
                                                              'sf_functional_cutting_tool_entity_ref',
diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py
index 1dc48322..99ff6419 100644
--- a/sf_tool_management/models/tool_material_search.py
+++ b/sf_tool_management/models/tool_material_search.py
@@ -108,8 +108,8 @@ class SfToolMaterialSearch(models.Model):
                                              'rel_cutting_product_template_material_search', '走刀方向',
                                              domain=[('type', '=', '走刀方向')])
     suitable_coolant_ids = fields.Many2many('maintenance.equipment.image',
-                                            'rel_coolant_product_template_material_search', '适合冷却液',
-                                            domain=[('type', '=', '冷却液')])
+                                            'rel_coolants_product_template_material_search', '适合冷却方式',
+                                            domain=[('type', '=', '冷却方式')])
 
     cutting_speed_ids = fields.Many2many('sf.cutting.speed', string='切削速度Vc')
     feed_per_tooth_ids = fields.Many2many('sf.feed.per.tooth', 'rel_feed_per_tooth_ids', '每齿走刀量fz')