From 1cf5cd41b41ade1da9fc77e3a5d133fd203053c3 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 29 Dec 2023 09:31:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=80=E5=85=B7=E5=9F=BA=E6=9C=AC=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=96=B0=E5=A2=9E=E9=80=82=E9=85=8D=E5=A4=B9=E5=A4=B4?=
 =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E5=AD=97=E6=AE=B5=EF=BC=8C2.=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_other_features.py                       | 2 +-
 sf_base/views/tool_views.xml                                | 1 -
 .../views/product_template_management_view.xml              | 6 +++---
 sf_sale/models/sale_order.py                                | 3 ++-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index c03ea9e9..6f118272 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -90,6 +90,7 @@ class ToolMaterialsBasicParameters(models.Model):
     # 刀柄参数
     flange_shank_length = fields.Float('法兰柄长(mm)')
     flange_diameter = fields.Float('法兰直径(mm)')
+    fit_chuck_size = fields.Char('适配夹头尺寸')
     handle_external_diameter = fields.Float('柄部外径(mm)')
     handle_inside_diameter = fields.Float('柄部内径(mm)')
     dynamic_balance_class = fields.Char('动平衡等级')
@@ -245,7 +246,6 @@ class ToolMaterialsBasicParameters(models.Model):
             'cutting_tool_type': obj['cutting_tool_type'],
             'total_length': obj['total_length'],
             'flange_shank_length': obj['flange_shank_length'],
-            'handle_external_diameter': obj['handle_external_diameter'],
             'handle_inside_diameter': obj['handle_inside_diameter'],
             'min_clamping_diameter': obj['min_clamping_diameter'],
             'max_clamping_diameter': obj['max_clamping_diameter'],
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index c9ea44e7..b9c72024 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -316,7 +316,6 @@
                                         <field name="name"/>
                                         <field name="total_length"/>
                                         <field name="flange_shank_length"/>
-                                        <field name="handle_external_diameter" class="diameter"/>
                                         <field name="handle_inside_diameter" class="diameter"/>
                                         <field name="min_clamping_diameter" class="diameter"/>
                                         <field name="max_clamping_diameter" class="diameter"/>
diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index f096de62..b1068c6c 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -28,13 +28,13 @@
                            options="{'no_create': True}"
                            attrs="{'invisible': ['|',('categ_type', '!=', '表面工艺'),('categ_type', '=', False)]}"/>
                     <field name="cutting_tool_material_id"
-                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('create_uid', '!=', False)]}"
+                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('categ_type', '!=', False)]}"
                            placeholder="请选择"/>
                     <field name="cutting_tool_model_id" placeholder="请选择"
-                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('create_uid', '!=', False)]}"
+                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('categ_type', '!=', False)]}"
                            domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
                     <field name="specification_id" placeholder="请选择"
-                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('create_uid', '!=', False)]}"
+                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('categ_type', '!=', False)]}"
                            domain="[('standard_library_id','=',cutting_tool_model_id)]"/>
                     <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
                            placeholder="请选择"/>
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 8cbcbb31..03ab0a88 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -103,7 +103,8 @@ class RePurchaseOrder(models.Model):
 
     def button_confirm(self):
         self.check_status = 'pending'
-        return super().button_confirm()
+        res = super().button_confirm()
+        return res
 
 
 class ResPartnerToSale(models.Model):