Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化

sf_manufacturing/models/mrp_production.py

@@ -1,6 +1,11 @@
 # -*- coding: utf-8 -*-
+import base64
+import logging
 import re
+import requests
 from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+from odoo.addons.sf_base.commons.common import Common
 
 
 class MrpProduction(models.Model):
@@ -40,6 +45,10 @@ class MrpProduction(models.Model):
 
     check_status = fields.Boolean(string='启用状态', default=False, readonly=True)
     active = fields.Boolean(string='已归档', default=True)
+    programming_no = fields.Char('编程单号')
+    work_state = fields.Char('业务状态')
+    programming_state = fields.Char('编程状态')
+    glb_file = fields.Binary("glb模型文件")
 
     @api.depends(
         'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state',
@@ -109,6 +118,48 @@ class MrpProduction(models.Model):
         for production in self:
             production.maintenance_count = len(production.request_ids)
 
+    # cnc程序获取
+    def fetchCNC(self):
+        cnc = self.env['mrp.production'].search([('id', '=', self.id)])
+        try:
+            res = {'model_code': '' if not cnc.product_id.model_code else cnc.product_id.model_code,
+                   'production_no': cnc.name,
+                   'machine_tool_code': "",
+                   'material_code': self.env['sf.production.materials'].search(
+                       [('id', '=', cnc.product_id.materials_id.id)]).materials_no,
+                   'material_type_code': self.env['sf.materials.model'].search(
+                       [('id', '=', cnc.product_id.materials_type_id.id)]).materials_no,
+                   'machining_processing_panel': cnc.product_id.model_processing_panel,
+                   'machining_precision': cnc.product_id.model_machining_precision,
+                   'embryo_long': cnc.product_id.bom_ids.bom_line_ids.product_id.length,
+                   'embryo_height': cnc.product_id.bom_ids.bom_line_ids.product_id.height,
+                   'embryo_width': cnc.product_id.bom_ids.bom_line_ids.product_id.width,
+                   'order_no': cnc.origin,
+                   'model_order_no': cnc.product_id.default_code.rsplit('  -', 1)[0],
+                   'user': cnc.env.user.name,
+                   'model_file': '' if not cnc.product_id.model_file else base64.b64encode(
+                       cnc.product_id.model_file).decode('utf-8')
+                   }
+            logging.info('res:%s' % res)
+            configsettings = self.env['res.config.settings'].get_values()
+            config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
+            url = '/api/intelligent_programming/create'
+            config_url = configsettings['sf_url'] + url
+            res['token'] = configsettings['token']
+            # res_str = json.dumps(res)
+            ret = requests.post(config_url, json={}, data=res, headers=config_header)
+            ret = ret.json()
+            logging.info('fetchCNC-ret:%s' % ret)
+            if ret['status'] == 1:
+                self.write(
+                    {'programming_no': ret['programming_no'], 'programming_state': '编程中', 'work_state': '编程中'})
+            else:
+                raise UserError(ret['message'])
+        except Exception as e:
+            logging.info('fetchCNC error:%s' % e)
+            raise UserError("cnc程序获取编程单失败,请联系管理员")
+
+
     # 维修模块按钮
     def button_maintenance_req(self):
         self.ensure_one()
@@ -196,6 +247,7 @@ class MrpProduction(models.Model):
                         'state': 'pending',
                     }]
             if production.product_id.categ_id.type == '成品':
+                production.fetchCNC()
                 # 根据加工面板的面数及对应的工序模板生成工单
                 i = 0
                 processing_panel_len = len(production.product_id.model_processing_panel.split(','))
@@ -428,7 +480,8 @@ class MrpProduction(models.Model):
                 current_sequence += 1
                 if work.name == '获取CNC加工程序':
                     work.button_start()
-                    work.fetchCNC()
+                    #work.fetchCNC()
+                    work.button_finish()
 
     # 创建工单并进行排序
     def _create_workorder(self):

sf_manufacturing/models/mrp_workcenter.py

@@ -22,7 +22,7 @@ class ResWorkcenter(models.Model):
 
 
     equipment_status = fields.Selection(
-        [("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")],
+        [("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"),("空闲", "空闲"),("封存(报废)", "封存(报废)")],
         string="设备状态", related='equipment_id.state')
 
     # @api.depends('equipment_id')

sf_manufacturing/models/mrp_workorder.py

@@ -450,7 +450,7 @@ class ResMrpWorkOrder(models.Model):
                    'embryo_height': cnc.product_id.bom_ids.bom_line_ids.product_id.height,
                    'embryo_width': cnc.product_id.bom_ids.bom_line_ids.product_id.width,
                    'order_no': cnc.production_id.origin,
-                   'model_order_no': cnc.product_id.default_code.rsplit('-', 1)[0],
+                   'model_order_no': cnc.product_id.default_code.rsplit('  -', 1)[0],
                    'user': self.env.user.name,
                    'model_file': '' if not cnc.product_id.model_file else base64.b64encode(
                        cnc.product_id.model_file).decode('utf-8')
@@ -574,6 +574,18 @@ class ResMrpWorkOrder(models.Model):
                     'order_line': order_line_ids,
                 })
         super().button_finish()
+        is_production_id = True
+        for workorder in self.production_id.workorder_ids:
+            if workorder.state != 'done':
+                is_production_id = False
+        if is_production_id == True and self.name == '解除装夹':
+            for move_raw_id in self.production_id.move_raw_ids:
+                move_raw_id.quantity_done = move_raw_id.product_uom_qty
+                self.production_id.state = 'done'
+
+
+
+
 
 
 class CNCprocessing(models.Model):
@@ -595,6 +607,7 @@ class CNCprocessing(models.Model):
     estimated_processing_time = fields.Char('预计加工时间')
     remark = fields.Text('备注')
     workorder_id = fields.Many2one('mrp.workorder', string="工单")
+    workorder_id = fields.Many2one('mrp.production', string="制造定单")
     button_state = fields.Boolean(string='是否已经下发')
 
     # mrs下发编程单创建CNC加工
@@ -620,11 +633,11 @@ class CNCprocessing(models.Model):
                 'remark': obj['remark']
             })
             self.get_cnc_processing_file(ret['folder_name'], cnc_processing, workorder.processing_panel)
-        cnc_workorder.state = 'done'
+        # cnc_workorder.state = 'done'
         cnc_workorder.work_state = '已编程'
         cnc_workorder.programming_state = '已编程'
-        cnc_workorder.time_ids.date_end = datetime.now()
-        cnc_workorder.button_finish()
+        # cnc_workorder.time_ids.date_end = datetime.now()
+        # cnc_workorder.button_finish()
 
     # 根据程序名和加工面匹配到ftp里对应的Nc程序名
     def get_cnc_processing_file(self, folder_name, cnc_processing, processing_panel):

sf_manufacturing/models/product_template.py

@@ -202,7 +202,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_length = self.specification_id.clamping_length
                 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
@@ -228,14 +227,12 @@ class ResProductMo(models.Model):
                 self.cutting_tool_inscribed_circle_tolerance = self.specification_id.inscribed_circle_tolerance
                 self.cutting_tool_install_aperture_diameter = self.specification_id.install_aperture_diameter
                 self.cutting_tool_chip_breaker_groove = self.specification_id.chip_breaker_groove
-                # self.cutting_tool_cut_depth_max = self.specification_id.blade_blade_number
+                self.cutting_tool_chip_breaker_type_code = self.specification_id.chip_breaker_type_code
                 self.cutting_tool_blade_blade_number = self.specification_id.blade_blade_number
                 self.cutting_tool_blade_width = self.specification_id.blade_width
                 self.cutting_tool_rear_angle = self.specification_id.relief_angle
                 self.cutting_tool_main_included_angle = self.specification_id.main_included_angle
                 self.cutting_tool_top_angle = self.specification_id.top_angle
-                self.cutting_tool_blade_tip_dip_angle = self.specification_id.blade_tip_dip_angle
-                self.cutting_tool_side_cutting_edge_angle = self.specification_id.side_cutting_edge_angle
                 self.cutting_tool_pitch = self.specification_id.pitch
                 self.cutting_tool_bladed_teeth_model = self.specification_id.blade_teeth_model
                 self.cutting_tool_thickness_tolerance = self.specification_id.thickness_tolerance
@@ -257,13 +254,20 @@ class ResProductMo(models.Model):
                 self.cutting_tool_inscribed_circle_tolerance = self.specification_id.inscribed_circle_tolerance
                 self.cutting_tool_install_aperture_diameter = self.specification_id.install_aperture_diameter
                 self.cutting_tool_chip_breaker_groove = self.specification_id.chip_breaker_groove
-                # self.cutting_tool_cut_depth_max = self.specification_id.blade_blade_number
+                self.cutting_tool_chip_breaker_type_code = self.specification_id.chip_breaker_type_code
                 self.cutting_tool_blade_blade_number = self.specification_id.blade_blade_number
                 self.cutting_tool_blade_width = self.specification_id.blade_width
                 self.cutting_tool_rear_angle = self.specification_id.relief_angle
                 self.cutting_tool_main_included_angle = self.specification_id.main_included_angle
                 self.cutting_tool_top_angle = self.specification_id.top_angle
-                self.cutting_tool_blade_tip_dip_angle = self.specification_id.blade_tip_dip_angle
+                self.cutting_tool_screw = self.specification_id.screw
+                self.cutting_tool_wrench = self.specification_id.wrench
+                self.cutting_tool_blade_id = self.specification_id.blade_id
+                self.cutting_tool_is_cooling_hole = self.specification_id.is_cooling_hole
+                self.cutting_tool_locating_slot_code = self.specification_id.locating_slot_code
+                self.cutting_tool_install_blade_tip_num = self.specification_id.install_blade_tip_num
+                self.cutting_tool_installing_structure = self.specification_id.installing_structure
+                self.cutting_tool_cut_depth_max = self.specification_id.cut_depth_max
                 if self.cutting_tool_type == '刀盘':
                     self.cutting_tool_blade_length = self.specification_id.blade_length
                     self.cutting_tool_cutter_head_diameter = self.specification_id.cutter_head_diameter
@@ -272,17 +276,27 @@ class ResProductMo(models.Model):
                     self.cutting_tool_knife_head_height = self.specification_id.knife_head_height
                     self.cutting_tool_knife_head_width = self.specification_id.knife_head_width
                     self.cutting_tool_knife_head_length = self.specification_id.knife_head_length
+                    self.cutting_tool_tool_shim = self.specification_id.tool_shim
+                    self.cutting_tool_cotter_pin = self.specification_id.cotter_pin
+                    self.cutting_tool_pressing_plate = self.specification_id.pressing_plate
             elif self.cutting_tool_type == '刀柄':
                 self.cutting_tool_total_length = self.specification_id.total_length
-                self.cutting_tool_standard_speed = self.specification_id.standard_rotate_speed
                 self.cutting_tool_speed_max = self.specification_id.max_rotate_speed
                 self.cutting_tool_change_time = self.specification_id.tool_changing_time
                 self.cutting_tool_total_length = self.specification_id.total_length
                 self.cutting_tool_clamping_diameter_max = self.specification_id.max_clamping_diameter
                 self.cutting_tool_clamping_diameter_min = self.specification_id.min_clamping_diameter
                 self.cutting_tool_flange_length = self.specification_id.flange_shank_length
-                self.cutting_tool_shank_outer_diameter = self.specification_id.handle_external_diameter
-                self.cutting_tool_shank_inner_diameter = self.specification_id.handle_inside_diameter
+                self.cutting_tool_flange_diameter = self.specification_id.flange_diameter
+                self.cutting_tool_fit_chuck_size = self.specification_id.fit_chuck_size
+                self.cutting_tool_dynamic_balance_class = self.specification_id.dynamic_balance_class
+                self.cutting_tool_is_high_speed_cutting = self.specification_id.is_quick_cutting
+                self.cutting_tool_is_safety_lock = self.specification_id.is_safe_lock
+                self.cutting_tool_fit_nut_model = self.specification_id.nut
+                self.cutting_tool_wrench = self.specification_id.spanner
+                self.cutting_tool_chuck_id = self.specification_id.chuck_id.id
+                self.cutting_tool_jump_accuracy = self.specification_id.diameter_slip_accuracy
+                self.cutting_tool_taper_shank_model = self.specification_id.taper_shank_model
             self.suitable_machining_method_ids = [(6, 0, [])] if not \
                 self.cutting_tool_model_id.suitable_machining_method_ids \
                 else [(6, 0, self.cutting_tool_model_id.suitable_machining_method_ids.ids)]
@@ -350,12 +364,12 @@ class ResProductMo(models.Model):
                         raise ValidationError("请选择压紧方式")
                 if self.cutting_tool_type == '刀片':
                     if not self.suitable_coolant_ids:
-                        raise ValidationError("请选择适合冷却液")
+                        raise ValidationError("请选择适合冷却方式")
             elif self.cutting_tool_type == '整体式刀具':
                 if not self.handle_type_id:
                     raise ValidationError("请选择柄部类型")
                 if not self.suitable_coolant_ids:
-                    raise ValidationError("请选择适合冷却液")
+                    raise ValidationError("请选择适合冷却方式")
             if not self.suitable_machining_method_ids:
                 raise ValidationError("请选择适合加工方式")
             if not self.blade_tip_characteristics_id:
@@ -369,11 +383,8 @@ class ResProductMo(models.Model):
     cutting_tool_rear_angle = fields.Integer('后角(°)')
     cutting_tool_main_included_angle = fields.Integer('主偏角(°)')
     # 适用夹头型号可以多选
-    cutting_tool_chuck_ids = fields.Many2many(
+    cutting_tool_chuck_id = fields.Many2one(
         'sf.cutting_tool.standard.library',
-        relation='product_cutting_tool_library_handle_chuck_rel',
-        column1='model_id_1',
-        column2='model_id_2',
         domain="[('cutting_tool_type', '=', '夹头')]",
         string='适用夹头型号')
     # 刀片参数
@@ -384,6 +395,7 @@ class ResProductMo(models.Model):
     cutting_tool_install_aperture_diameter = fields.Float('安装孔直径(mm)')
     cutting_tool_chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
                                                         string='有无断屑槽')
+    cutting_tool_chip_breaker_type_code = fields.Char('断屑槽型代号')
     cutting_tool_bladed_teeth_model = fields.Selection(
         [('无', '无'), ('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
          ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
@@ -395,8 +407,6 @@ class ResProductMo(models.Model):
          ('7', '7'), ('8', '8'), ('9', '9'), ('10', '10')],
         string='刀片的刃数(个)')
 
-    cutting_tool_blade_tip_dip_angle = fields.Integer('刀尖倾角(°)')
-    cutting_tool_side_cutting_edge_angle = fields.Integer('侧切削角(°)')
     cutting_tool_thread_model = fields.Selection([('无', '无'), ('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')],
                                                  string='螺纹类型')
     cutting_tool_thread_num = fields.Float('每英寸螺纹数(tpi)')
@@ -431,11 +441,8 @@ class ResProductMo(models.Model):
     cutting_tool_min_machining_aperture = fields.Integer('最小加工孔径(mm)')
     cutting_tool_install_blade_tip_num = fields.Integer('可装刀片数/齿数(个)', size=20)
     cutting_tool_installing_structure = fields.Char('安装结构', size=20)
-    cutting_tool_blade_ids = fields.Many2many(
+    cutting_tool_blade_id = fields.Many2one(
         'sf.cutting_tool.standard.library',
-        relation='product_cutting_tool_library_pad_blade_rel',
-        column1='model_id_1',
-        column2='model_id_2',
         domain="[('cutting_tool_type', '=', '刀片')]",
         string='适用刀片型号'  # 使用空列表作为默认值
     )
@@ -451,24 +458,23 @@ class ResProductMo(models.Model):
     cutting_tool_interface_diameter = fields.Float('接口直径(mm)')
 
     # 刀柄参数
-    cutting_tool_shank_outer_diameter = fields.Float('柄部外径(mm)')
-    cutting_tool_shank_inner_diameter = fields.Float('柄部内径(mm)')
-    cutting_tool_clamping_length = fields.Float('夹持长度(mm)')
-    cutting_tool_clamping_tolerance = fields.Float('夹持公差(mm)')
     cutting_tool_clamping_diameter_max = fields.Float('最大夹持直径')
     cutting_tool_clamping_diameter_min = fields.Float('最小夹持直径')
     cutting_tool_flange_length = fields.Float('法兰柄长(mm)')
     cutting_tool_flange_diameter = fields.Float('法兰直径(mm)')
-    cutting_tool_is_rough_finish = fields.Boolean('可粗加工', default=False)
-    cutting_tool_is_finish = fields.Boolean('可精加工', default=False)
-    cutting_tool_is_drill_hole = fields.Boolean('可钻孔', default=False)
     cutting_tool_is_safety_lock = fields.Boolean('有无安全锁', default=False)
     cutting_tool_is_high_speed_cutting = fields.Boolean('可高速切削', default=False)
     cutting_tool_change_time = fields.Integer('换刀时间(s)')
     cutting_tool_clamping_way = fields.Char('夹持方式')
+    cutting_tool_fit_chuck_size = fields.Char('适配夹头尺寸')
+    cutting_tool_taper_shank_model = fields.Char('锥柄型号')
     cutting_tool_standard_speed = fields.Integer('标准转速(n/min)')
     cutting_tool_speed_max = fields.Integer('最大转速(n/min)')
     cutting_tool_cooling_type = fields.Char('冷却类型')
+    cutting_tool_dynamic_balance_class = fields.Char('动平衡等级')
+    cutting_tool_fit_nut_model = fields.Char('适用锁紧螺母型号')
+
+
     # 夹头参数
     cutting_tool_taper = fields.Integer('锥度(°)')
     cutting_tool_top_diameter = fields.Float('顶部直径')
@@ -476,7 +482,7 @@ class ResProductMo(models.Model):
     cutting_tool_inner_diameter = fields.Float('内径(mm)')
     cooling_suit_type_ids = fields.Char('适用冷却套型号')
     cutting_tool_max_load_capacity = fields.Float('最大负载能力(kg)')
-    cutting_tool_er_size_model = fields.Char('ER尺寸型号')
+    cutting_tool_er_size_model = fields.Char('尺寸型号')
     cutting_tool_handle_ids = fields.Many2many(
         'sf.cutting_tool.standard.library',
         relation='product_cutting_tool_library_chuck_handle_rel',
@@ -486,28 +492,6 @@ class ResProductMo(models.Model):
         string='适用刀柄型号'
     )
 
-    # 夹具参数
-    fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料")
-    fixture_model_id = fields.Many2one('sf.fixture.model', string="夹具型号")
-    fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
-    fixture_multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
-    fixture_clamping_way = fields.Char(string="装夹方式")
-    fixture_port_type = fields.Char(string="接口类型")
-    fixture_model_file = fields.Binary(string="3D模型图")
-
-    fixture_clamp_workpiece_length_max = fields.Integer(string="夹持工件长度max(mm)")
-    fixture_clamp_workpiece_width_max = fields.Integer(string="夹持工件宽度max(mm)")
-    fixture_clamp_workpiece_height_max = fields.Integer(string="夹持工件高度max(mm)")
-    fixture_clamp_workpiece_diameter_max = fields.Float(string="夹持工件直径max(mm)", digits=(16, 6))
-
-    fixture_maximum_carrying_weight = fields.Float(string="最大承载重量(kg)", digits=(16, 4))
-    fixture_maximum_clamping_force = fields.Integer(string="最大夹持力(n)")
-    fixture_driving_way = fields.Char(string="驱动方式")
-    fixture_apply_machine_tool_type_ids = fields.Many2many('sf.machine_tool.type', 'rel_product_machine_tool_type',
-                                                           string="适用机床型号")
-    fixture_through_hole_size = fields.Integer(string="过孔大小(mm)")
-    fixture_screw_size = fields.Integer(string="螺牙大小(mm)")
-
     # 注册状态
     register_state = fields.Selection([('未注册', '未注册'), ('已注册', '已注册'), ('注册失败', '注册失败')],
                                       string='注册状态', default='未注册')
@@ -569,12 +553,6 @@ class ResProductMo(models.Model):
             code_arr.append(i.code)
         return code_arr
 
-    def _json_chuck_item_code(self, item):
-        code_arr = []
-        for i in item.product_id.cutting_tool_chuck_ids:
-            code_arr.append(i.code)
-        return code_arr
-
     def _json_cutter_bar_item_code(self, item):
         code_arr = []
         for i in item.product_id.cutting_tool_cutter_bar_ids:
@@ -587,12 +565,6 @@ class ResProductMo(models.Model):
             code_arr.append(i.code)
         return code_arr
 
-    def _json_blade_item_code(self, item):
-        code_arr = []
-        for i in item.product_id.cutting_tool_blade_ids:
-            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:
@@ -625,7 +597,6 @@ class ResProductMo(models.Model):
         for item in self:
             if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具', '虎钳夹具', '零点卡盘']:
                 item.brand_id = item.fixture_model_id.brand_id.id
-                item.fixture_multi_mounting_type_id = item.fixture_model_id.multi_mounting_type_id.id
                 item.fixture_model_file = item.fixture_model_id.model_file
                 item.tool_length = item.fixture_model_id.length
                 item.tool_width = item.fixture_model_id.width
@@ -826,6 +797,124 @@ class ResProductMo(models.Model):
         return base64_data
 
 
+class ResProductFixture(models.Model):
+    _inherit = 'product.template'
+    _description = '夹具产品信息'
+
+    fixture_model_id = fields.Many2one('sf.fixture.model', '夹具型号')
+    specification_fixture_id = fields.Many2one('sf.fixture.materials.basic.parameters', '夹具规格')
+
+    fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料", required=True)
+    fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
+    multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型", required=True)
+    model_file = fields.Binary(string="3D模型图")
+
+    # 夹具物料基本参数
+    # length = fields.Float('长度(mm)', digits=(16, 2))
+    # width = fields.Float('宽度(mm)', digits=(16, 2))
+    # height = fields.Float('高度(mm)', digits=(16, 2))
+    diameter = fields.Float('直径(mm)', digits=(16, 2))
+
+    # '零点卡盘' 字段
+    weight = fields.Float('重量(mm)', digits=(16, 2))
+    orientation_dish_diameter = fields.Float('定位盘直径(mm)', digits=(16, 2))
+    clamping_diameter = fields.Float('装夹直径(mm)', digits=(16, 2))
+    clamping_num = fields.Selection([('1', '1'), ('2', '2'), ('4', '4'), ('6', '6'), ('8', '8')], string='装夹单元数')
+    chucking_power_max = fields.Float('最大夹持力(KN)', digits=(16, 2))
+    repeated_positioning_accuracy = fields.Char('重复定位精度(mm)', size=20)
+    boolean_transposing_hole = fields.Boolean('是否有转位孔')
+    unlocking_method = fields.Selection(
+        [('手动', '手动'), ('气动', '气动'), ('液压', '液压'), ('电动', '电动'), ('其他', '其他')], string='解锁方式')
+    boolean_chip_blowing_function = fields.Boolean('是否有吹屑功能')
+    carrying_capacity_max = fields.Float('最大承载重量(kg)', digits=(16, 2))
+    rigidity = fields.Integer('硬度HRC')
+    materials_model_id = fields.Many2one('sf.materials.model', '夹具材质')
+    machine_tool_type_id = fields.Many2one('sf.machine_tool.type', '适用机床型号')
+
+    # ’零点托盘‘ 字段
+    connector_diameter = fields.Selection([('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('8', '8')],
+                                          string='连接头直径(mm)')
+    way_to_install = fields.Selection(
+        [('接口式', '接口式'), ('螺栓固定', '螺栓固定'), ('磁吸式', '磁吸式'), ('其他', '其他')], string='安装方式')
+    type_of_drive = fields.Selection(
+        [('气动式', '气动式'), ('液压式', '液压式'), ('机械式', '机械式'), ('电动式', '电动式'), ('其他', '其他')],
+        string='驱动方式')
+
+    # ’气动夹具‘ 字段
+    gripper_length_min = fields.Float('夹持工件最小长度(mm)', digits=(16, 2))
+    gripper_width_min = fields.Float('夹持工件最小宽度(mm)', digits=(16, 2))
+    gripper_height_min = fields.Float('夹持工件最小高度(mm)', digits=(16, 2))
+    gripper_diameter_min = fields.Float('夹持工件最小直径(mm)', digits=(16, 2))
+    gripper_length_max = fields.Float('夹持工件最大长度(mm)', digits=(16, 2))
+    gripper_width_max = fields.Float('夹持工件最大宽度(mm)', digits=(16, 2))
+    gripper_height_max = fields.Float('夹持工件最大高度(mm)', digits=(16, 2))
+    gripper_diameter_max = fields.Float('夹持工件最大直径(mm)', digits=(16, 2))
+    rated_air_pressure = fields.Float('额定气压(Mpa)', digits=(16, 2))
+    interface_materials_model_id = fields.Many2one('sf.materials.model', '接口类型')
+
+    # ‘虎钳夹具' 字段
+    transverse_groove = fields.Float('横向配合槽n(mm)', digits=(16, 2))
+    longitudinal_fitting_groove = fields.Float('纵向配合槽l(mm)', digits=(16, 2))
+
+    # '磁吸夹具' 字段
+    height_tolerance_value = fields.Char('高度公差(mm)')
+    rated_adsorption_force = fields.Float('额定吸附力(N/cm²)', digits=(16, 2))
+    magnetic_field_height = fields.Float('磁场高度(mm)', digits=(16, 2))
+    magnetic_pole_plate_grinding_allowance = fields.Float('磁极板磨削余量(mm)', digits=(16, 2))
+
+    # '转接板(锁板)夹具' 字段
+    screw_size = fields.Float('螺牙大小(mm)', digits=(16, 2))
+    via_hole_diameter = fields.Float('过孔直径(mm)', digits=(16, 2))
+
+    # '三爪卡盘' 字段
+    mounting_hole_depth = fields.Float('安装孔深度(mm)', digits=(16, 2))
+    centering_diameter = fields.Float('定心直径(mm)', digits=(16, 2))
+
+    @api.onchange('specification_fixture_id')
+    def _onchange_specification_fixture_id(self):
+        if self.specification_fixture_id:
+            self.length = self.specification_fixture_id.length
+            self.width = self.specification_fixture_id.width
+            self.height = self.specification_fixture_id.height
+            self.weight = self.specification_fixture_id.weight
+            self.diameter = self.specification_fixture_id.diameter
+            self.orientation_dish_diameter = self.specification_fixture_id.orientation_dish_diameter
+            self.clamping_diameter = self.specification_fixture_id.clamping_diameter
+            self.clamping_num = self.specification_fixture_id.clamping_num
+            self.chucking_power_max = self.specification_fixture_id.chucking_power_max
+            self.repeated_positioning_accuracy = self.specification_fixture_id.repeated_positioning_accuracy
+            self.boolean_transposing_hole = self.specification_fixture_id.boolean_transposing_hole
+            self.unlocking_method = self.specification_fixture_id.unlocking_method
+            self.boolean_chip_blowing_function = self.specification_fixture_id.boolean_chip_blowing_function
+            self.carrying_capacity_max = self.specification_fixture_id.carrying_capacity_max
+            self.rigidity = self.specification_fixture_id.rigidity
+            self.materials_model_id = self.specification_fixture_id.materials_model_id
+            self.machine_tool_type_id = self.specification_fixture_id.machine_tool_type_id
+            self.connector_diameter = self.specification_fixture_id.connector_diameter
+            self.way_to_install = self.specification_fixture_id.way_to_install
+            self.type_of_drive = self.specification_fixture_id.type_of_drive
+            self.gripper_length_min = self.specification_fixture_id.gripper_length_min
+            self.gripper_width_min = self.specification_fixture_id.gripper_width_min
+            self.gripper_height_min = self.specification_fixture_id.gripper_height_min
+            self.gripper_diameter_min = self.specification_fixture_id.gripper_diameter_min
+            self.gripper_length_max = self.specification_fixture_id.gripper_length_max
+            self.gripper_width_max = self.specification_fixture_id.gripper_width_max
+            self.gripper_height_max = self.specification_fixture_id.gripper_height_max
+            self.gripper_diameter_max = self.specification_fixture_id.gripper_diameter_max
+            self.rated_air_pressure = self.specification_fixture_id.rated_air_pressure
+            self.interface_materials_model_id = self.specification_fixture_id.interface_materials_model_id
+            self.transverse_groove = self.specification_fixture_id.transverse_groove
+            self.longitudinal_fitting_groove = self.specification_fixture_id.longitudinal_fitting_groove
+            self.height_tolerance_value = self.specification_fixture_id.height_tolerance_value
+            self.rated_adsorption_force = self.specification_fixture_id.rated_adsorption_force
+            self.magnetic_field_height = self.specification_fixture_id.magnetic_field_height
+            self.magnetic_pole_plate_grinding_allowance = self.specification_fixture_id.magnetic_pole_plate_grinding_allowance
+            self.screw_size = self.specification_fixture_id.screw_size
+            self.via_hole_diameter = self.specification_fixture_id.via_hole_diameter
+            self.mounting_hole_depth = self.specification_fixture_id.mounting_hole_depth
+            self.centering_diameter = self.specification_fixture_id.centering_diameter
+
+
 class SfMaintenanceEquipmentAndProductTemplate(models.Model):
     _inherit = 'maintenance.equipment'
     _description = '设备'

sf_manufacturing/models/stock.py

@@ -386,8 +386,6 @@ class ReStockMove(models.Model):
                 'brand_code': self.env['sf.machine.brand'].search([('id', '=', item.product_id.brand_id.id)]).code,
                 'fixture_material_code': self.env['sf.fixture.material'].search(
                     [('id', '=', item.product_id.fixture_material_id.id)]).code,
-                'fixture_multi_mounting_type_code': self.env['sf.multi_mounting.type'].search(
-                    [('id', '=', item.product_id.fixture_multi_mounting_type_id.id)]).code,
                 'fixture_materials_type_code': self.env['sf.materials.model'].search(
                     [('id', '=', item.product_id.materials_type_id.id)]).materials_no,
                 'fixture_clamping_way': item.product_id.fixture_clamping_way,