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 @@ - 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)]}"/> 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):