夹具型号相关数据表的优化

Merge Request: BUG_7276_lxb_commit

Created By: @李晓斌
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @李晓斌
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2285

requirements.txt

@@ -4,4 +4,4 @@ wechatpy==1.8.18
 pycryptodome==3.22.0
 openupgradelib==3.10.0
 opcua==0.98.13
-openpyxl
+openpyxl

sf_base/models/basic_parameters_fixture.py

@@ -67,6 +67,77 @@ class BasicParametersFixture(models.Model):
     mounting_hole_depth = fields.Float('安装孔深度(mm)', digits=(16, 2))
     centering_diameter = fields.Float('定心直径(mm)', digits=(16, 2))
 
+        # ‘磁吸托盘’ 字段
+    magnet_tray_length = fields.Float('磁吸托盘长度(mm)', digits=(16, 2))
+    magnet_tray_width = fields.Float('磁吸托盘宽度(mm)', digits=(16, 2))
+    magnet_tray_height = fields.Float('磁吸托盘厚度(mm)', digits=(16, 2))
+    magnet_tray_diameter = fields.Float('磁吸托盘直径(mm)', digits=(16, 2))
+    magnet_tray_weight = fields.Float('磁吸托盘重量(kg)', digits=(16, 2))
+
+    magnet_max_adsorp_length = fields.Float('磁吸托盘最大吸附长度(mm)', digits=(16, 2))
+    magnet_max_adsorp_width = fields.Float('磁吸托盘最大吸附宽度(mm)', digits=(16, 2))
+    magnet_max_adsorp_height = fields.Float('磁吸托盘最大吸附厚度(mm)', digits=(16, 2))
+    magnet_max_adsorp_diameter = fields.Float('磁吸托盘最大吸附直径(mm)', digits=(16, 2))
+    magnet_max_adsorp_force = fields.Float('磁吸托盘最大吸附力(N)', digits=(16, 2))
+
+    magnet_unlocking_method = fields.Selection(
+        [('手动', '手动'), ('气动', '气动'), ('液压', '液压'), ('电动', '电动'), ('其他', '其他')],
+        string='磁吸托盘锁紧方式'
+    )
+    magnet_flatness = fields.Char('磁吸托盘平面精度(mm)', size=20)
+    magnet_max_load = fields.Float('磁吸托盘最大负载(kg)', digits=(16, 2))
+
+    # --- 定位隔板字段 ---
+    partition_length_outer = fields.Float('外框长度(mm)', digits=(16, 2))
+    partition_width_outer = fields.Float('外框宽度(mm)', digits=(16, 2))
+    partition_length_inner = fields.Float('内框长度(mm)', digits=(16, 2))
+    partition_width_inner = fields.Float('内框宽度(mm)', digits=(16, 2))
+    partition_left_margin = fields.Float('左边距(mm)', digits=(16, 2))
+    partition_bottom_margin = fields.Float('下边距(mm)', digits=(16, 2))
+    partition_unit_length = fields.Float('定位单元长度(mm)', digits=(16, 2))
+    partition_unit_width = fields.Float('定位单元宽度(mm)', digits=(16, 2))
+    partition_unit_row_spacing = fields.Float('单元行间距(mm)', digits=(16, 2))
+    partition_unit_col_spacing = fields.Float('单元列间距(mm)', digits=(16, 2))
+    partition_unit_rows = fields.Integer('单元行数')
+    partition_unit_cols = fields.Integer('单元列数')
+    partition_base_unit_row_spacing = fields.Float('基准单元行间距(mm)', digits=(16, 2))
+    partition_base_unit_col_spacing = fields.Float('基准单元列间距(mm)', digits=(16, 2))
+    partition_offset_x = fields.Float('X方向偏移(mm)', digits=(16, 2))
+    partition_offset_y = fields.Float('Y方向偏移(mm)', digits=(16, 2))
+    partition_materials_model_id = fields.Many2one('sf.materials.model', '定位隔板材质')
+    partition_joint_type = fields.Selection([
+        ('bolt', '螺栓连接'),
+        ('magnet', '磁吸连接'),
+        ('snap', '卡扣连接'),
+    ], string='连接方式')
+    partition_partner_id = fields.Many2one('res.partner', string='供应商/客户')
+
+    # ‘气吸托盘’ 字段
+    air_tray_length = fields.Float('气吸托盘长度(mm)', digits=(16, 2))
+    air_tray_width = fields.Float('气吸托盘宽度(mm)', digits=(16, 2))
+    air_tray_height = fields.Float('气吸托盘高度(mm)', digits=(16, 2))
+    air_tray_diameter = fields.Float('气吸托盘直径(mm)', digits=(16, 2))
+    air_tray_weight = fields.Float('气吸托盘重量(kg)', digits=(16, 2))
+
+    air_max_adsorp_length = fields.Float('气吸托盘最大吸附长度(mm)', digits=(16, 2))
+    air_max_adsorp_width = fields.Float('气吸托盘最大吸附宽度(mm)', digits=(16, 2))
+    air_max_adsorp_height = fields.Float('气吸托盘最大吸附厚度(mm)', digits=(16, 2))
+    air_max_adsorp_diameter = fields.Float('气吸托盘最大吸附直径(mm)', digits=(16, 2))
+    air_max_adsorp_force = fields.Float('气吸托盘最大吸附力(N)', digits=(16, 2))
+
+    air_unlocking_method = fields.Selection(
+        [('手动', '手动'), ('气动', '气动'), ('液压', '液压'), ('电动', '电动'), ('其他', '其他')],
+        string='气吸托盘锁紧方式'
+    )
+    air_flatness = fields.Char('气吸托盘平面精度(mm)', size=20)
+    air_max_load = fields.Float('气吸托盘最大负载(kg)', digits=(16, 2))
+    air_boolean_chip_blowing_function = fields.Boolean('气吸托盘是否有吹屑功能')
+    air_way_to_install = fields.Selection(
+        [('接口式', '接口式'), ('螺栓固定', '螺栓固定'), ('磁吸式', '磁吸式'), ('其他', '其他')],
+        string='气吸托盘安装方式'
+    )
+
+
     code = fields.Char('编码')
     active = fields.Boolean('有效', default=True)
 
@@ -85,6 +156,12 @@ class BasicParametersFixture(models.Model):
             return self._json_adapter_board_fixture_param(fixture_materials_data)
         elif fixture_materials_name == '三爪卡盘':
             return self._json_scroll_chuck_param(fixture_materials_data)
+        elif fixture_materials_name == '磁吸托盘':
+            return self._json_magnet_tray_param(fixture_materials_data)
+        elif fixture_materials_name == '定位隔板':
+            return self._json_positioning_partition_param(fixture_materials_data)
+        elif fixture_materials_name == '气吸托盘':
+            return self._json_air_tray_param(fixture_materials_data)
         return {}
 
     def _json_zero_chuck_param(self, obj):
@@ -284,3 +361,90 @@ class BasicParametersFixture(models.Model):
                 'centering_diameter': obj['centering_diameter'],
                 'type_of_drive': obj['type_of_drive'],
                 'active': obj['active']}
+
+    def _json_magnet_tray_param(self, obj):
+        """磁吸托盘：将data数据转换成list数据"""
+        return {
+            'code': obj['code'],
+            'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
+                [('code', '=', obj.get('fixture_model_code'))]).id,
+            'name': obj['name'],
+            'length': obj['length'],
+            'width': obj['width'],
+            'height': obj['height'],
+            'diameter': obj['diameter'],
+            'weight': obj['weight'],
+            'max_adsorp_length': obj['max_adsorp_length'],
+            'max_adsorp_width': obj['max_adsorp_width'],
+            'max_adsorp_height': obj['max_adsorp_height'],
+            'max_adsorp_diameter': obj.get('max_adsorp_diameter'),
+            'max_adsorp_force': obj['max_adsorp_force'],
+            'flatness': obj.get('flatness'),
+            'max_load': obj.get('max_load'),
+            'unlocking_method': obj.get('unlocking_method'),
+            'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]
+            ).id if obj.get('materials_model_id') else False,
+            'active': obj.get('active', True),
+        }
+    
+    def _json_positioning_partition_param(self, obj):
+        """定位隔板：将data数据转换成字段字典"""
+        return {
+            'code': obj.get('code'),
+            'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
+                [('code', '=', obj.get('fixture_model_code'))], limit=1).id,
+            'name': obj.get('name'),
+            'partition_length_outer': obj.get('length_outer'),
+            'partition_width_outer': obj.get('width_outer'),
+            'partition_length_inner': obj.get('length_inner'),
+            'partition_width_inner': obj.get('width_inner'),
+            'partition_left_margin': obj.get('left_margin'),
+            'partition_bottom_margin': obj.get('bottom_margin'),
+            'partition_unit_length': obj.get('unit_length'),
+            'partition_unit_width': obj.get('unit_width'),
+            'partition_unit_row_spacing': obj.get('unit_row_spacing'),
+            'partition_unit_col_spacing': obj.get('unit_col_spacing'),
+            'partition_unit_rows': obj.get('unit_rows'),
+            'partition_unit_cols': obj.get('unit_cols'),
+            'partition_base_unit_row_spacing': obj.get('base_unit_row_spacing'),
+            'partition_base_unit_col_spacing': obj.get('base_unit_col_spacing'),
+            'partition_offset_x': obj.get('offset_x'),
+            'partition_offset_y': obj.get('offset_y'),
+            'partition_materials_model_id': self.env['sf.materials.model'].sudo().search(
+                [('materials_no', '=', obj.get('materials_model_id')), ('active', '=', True)], limit=1).id
+            if obj.get('materials_model_id') else False,
+            'partition_partner_id': self.env['res.partner'].sudo().search(
+                [('name', '=', obj.get('partner_name'))], limit=1).id
+            if obj.get('partner_name') else False,
+            'partition_joint_type': obj.get('joint_type'),
+            'active': obj.get('active', True),
+        }
+
+    def _json_air_tray_param(self, obj):
+        """气吸托盘：将data数据转换成list数据"""
+        return {
+            'code': obj['code'],
+            'fixture_model_id': self.env['sf.fixture.model'].sudo().search(
+                [('code', '=', obj.get('fixture_model_code'))]).id,
+            'name': obj['name'],
+            'length': obj['length'],
+            'width': obj['width'],
+            'height': obj['height'],
+            'diameter': obj['diameter'],
+            'weight': obj['weight'],
+            'max_adsorp_length': obj['max_adsorp_length'],
+            'max_adsorp_width': obj['max_adsorp_width'],
+            'max_adsorp_height': obj['max_adsorp_height'],
+            'max_adsorp_diameter': obj.get('max_adsorp_diameter'),
+            'max_adsorp_force': obj['max_adsorp_force'],
+            'flatness': obj.get('flatness'),
+            'max_load': obj.get('max_load'),
+            'unlocking_method': obj.get('unlocking_method'),
+            'boolean_chip_blowing_function': obj.get('blowing_function', False),
+            'way_to_install': obj.get('way_to_install'),
+            'materials_model_id': self.env['sf.materials.model'].sudo().search(
+                [('materials_no', '=', obj['materials_model_id']), ('active', '=', True)]
+            ).id if obj.get('materials_model_id') else False,
+            'active': obj.get('active', True),
+        }

sf_base/models/fixture.py

@@ -35,6 +35,7 @@ class FixtureModel(models.Model):
     glb_url = fields.Char(string="图片")
     status = fields.Boolean('状态')
     active = fields.Boolean('有效', default=False)
+    code = fields.Char(string='编码', readonly=True)
 
     zero_chuck_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                      string='零点卡盘基本参数')
@@ -46,11 +47,16 @@ class FixtureModel(models.Model):
                                            string='虎钳夹具基本参数')
     magnet_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                          string='磁吸夹具基本参数')
+    magnet_tray_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
+                                     string='磁吸托盘基本参数')
+    positioning_partition_ids = fields.One2many('sf.fixture.materials.basic.parameters','fixture_model_id',
+                                                string='定位隔板基本参数')
     adapter_board_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                                 string='转接板(锁板)夹具基本参数')
     scroll_chuck_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
                                        string='三爪卡盘基本参数')
-    code = fields.Char(string='编码', readonly=True)
+    air_tray_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id',
+                                    string='气吸托盘基本参数')
 
     # def _get_code(self, fixture_model_type_code):
     #     fixture_model = self.env['sf.fixture.model'].sudo().search(

sf_base/views/fixture_view.xml

@@ -328,6 +328,80 @@
                                     <field name="type_of_drive"/>
                                 </tree>
                             </field>
+                            <field name="air_tray_ids"
+                                attrs="{'invisible': [('fixture_material_type', '!=', '气吸托盘')]}">
+                                <tree editable="bottom" class="center" delete="0">
+                                    <field name="code" invisible="1"/>
+                                    <field name="name"/>
+                                    <field name="length"/>
+                                    <field name="width"/>
+                                    <field name="height"/>
+                                    <field name="diameter"/>
+                                    <field name="weight" string="重量(kg)"/>
+                                    <field name="max_adsorp_length"/>
+                                    <field name="max_adsorp_width"/>
+                                    <field name="max_adsorp_height"/>
+                                    <field name="max_adsorp_diameter"/>
+                                    <field name="max_adsorp_force"/>
+                                    <field name="flatness"/>
+                                    <field name="max_load"/>
+                                    <field name="unlocking_method"/>
+                                    <field name="boolean_chip_blowing_function"/>
+                                    <field name="way_to_install"/>
+                                    <field name="materials_model_id" options="{'no_create': True}" placeholder="请选择"/>
+                                    <field name="active" invisible="1"/>
+                                </tree>
+                            </field>
+                            <field name="magnet_tray_ids"
+                                attrs="{'invisible': [('fixture_material_type', '!=', '磁吸托盘')]}">
+                                <tree editable="bottom" class="center" delete="0">
+                                    <field name="code" invisible="1"/>
+                                    <field name="name"/>
+                                    <field name="length"/>
+                                    <field name="width"/>
+                                    <field name="height"/>
+                                    <field name="diameter"/>
+                                    <field name="weight" string="重量(kg)"/>
+                                    <field name="max_adsorp_length"/>
+                                    <field name="max_adsorp_width"/>
+                                    <field name="max_adsorp_height"/>
+                                    <field name="max_adsorp_diameter"/>
+                                    <field name="max_adsorp_force"/>
+                                    <field name="flatness"/>
+                                    <field name="max_load"/>
+                                    <field name="unlocking_method"/>
+                                    <field name="materials_model_id" options="{'no_create': True}" placeholder="请选择"/>
+                                    <field name="active" invisible="1"/>
+                                </tree>
+                            </field>
+                            <field name="positioning_partition_ids"
+                                attrs="{'invisible': [('fixture_material_type', '!=', '定位隔板')]}">
+                                <tree editable="bottom" class="center" delete="0">
+                                    <field name="code" invisible="1"/>
+                                    <field name="name"/>
+                                    <field name="partition_length_outer"/>
+                                    <field name="partition_width_outer"/>
+                                    <field name="partition_length_inner"/>
+                                    <field name="partition_width_inner"/>
+                                    <field name="partition_left_margin"/>
+                                    <field name="partition_bottom_margin"/>
+                                    <field name="partition_unit_length"/>
+                                    <field name="partition_unit_width"/>
+                                    <field name="partition_unit_row_spacing"/>
+                                    <field name="partition_unit_col_spacing"/>
+                                    <field name="partition_unit_rows"/>
+                                    <field name="partition_unit_cols"/>
+                                    <field name="station_count" readonly="1"/>
+                                    <field name="partition_base_unit_row_spacing"/>
+                                    <field name="partition_base_unit_col_spacing"/>
+                                    <field name="partition_offset_x"/>
+                                    <field name="partition_offset_y"/>
+                                    <field name="partition_joint_type"/>
+                                    <field name="partition_partner_id" options="{'no_create': True}" placeholder="请选择"/>
+                                    <field name="partition_materials_model_id" options="{'no_create': True}" placeholder="请选择"/>
+                                    <field name="active" invisible="1"/>
+                                </tree>
+                            </field>
                             <field name="scroll_chuck_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '三爪卡盘')]}">
                                 <tree editable="bottom" class="center" delete="0">

sf_demand_plan/models/sf_demand_plan.py

@@ -38,7 +38,7 @@ class SfDemandPlan(models.Model):
                                   related='product_id.blank_type')
     blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型',
                                        related='product_id.blank_precision')
-    manual_quotation = fields.Boolean('人工编程',related='product_id.manual_quotation', default=False)
+    manual_quotation = fields.Boolean('人工编程', related='product_id.manual_quotation', default=False)
     embryo_long = fields.Char('坯料尺寸(mm)', compute='_compute_embryo_long', store=True)
     is_incoming_material = fields.Boolean('客供料', related='sale_order_line_id.is_incoming_material', store=True)
     pending_qty = fields.Float(
@@ -222,15 +222,12 @@ class SfDemandPlan(models.Model):
         line_ids = self.line_ids.filtered(lambda p: p.status == '30')
         sum_product_uom_qty = sum(line_ids.mapped('plan_uom_qty'))
         customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
-        for line in self.line_ids:
-            if line.manual_quotation and line.custom_made_type == 'automation':
-                raise ValidationError(f"产品{line.product_id.name}为人工编程,不能选择自动化产线加工")
         if not self.overdelivery_allowed and line_ids.filtered(lambda p: p.location_id.id == customer_location_id):
             if float_compare(sum_product_uom_qty, self.product_uom_qty,
-                                          precision_rounding=self.product_id.uom_id.rounding) == 1:
+                             precision_rounding=self.product_id.uom_id.rounding) == 1:
                 raise ValidationError(f"已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
         elif float_compare(sum_product_uom_qty, self.product_uom_qty,
-                                          precision_rounding=self.product_id.uom_id.rounding) == 1: 
+                           precision_rounding=self.product_id.uom_id.rounding) == 1:
             return {
                 'name': _('需求计划'),
                 'type': 'ir.actions.act_window',
@@ -246,11 +243,12 @@ class SfDemandPlan(models.Model):
         else:
             for demand_plan_line_id in line_ids:
                 demand_plan_line_id.action_confirm()
-    #需求要求取值格式是来源+来源明细行ID,但是来源明细行ID取得就是product_id.name得最后一位，所以这里也直接截取product_id.name        
+
+    # 需求要求取值格式是来源+来源明细行ID,但是来源明细行ID取得就是product_id.name得最后一位，所以这里也直接截取product_id.name
     @api.depends('product_id.name')
     def _compute_demand_plan_number(self):
         for line in self:
-            product_name = line.product_id.name or '' 
+            product_name = line.product_id.name or ''
             plan_no = None
             if line.product_id:
                 # 使用正则表达式匹配P-后面的所有字符
@@ -259,4 +257,4 @@ class SfDemandPlan(models.Model):
                     plan_no = match.group(1)
                 line.demand_plan_number = plan_no
             else:
-                line.demand_plan_number = None
+                line.demand_plan_number = None

sf_demand_plan/models/sf_production_demand_plan.py

@@ -81,6 +81,7 @@ class SfProductionDemandPlan(models.Model):
                                   related='product_id.blank_type')
     blank_precision = fields.Selection([('精坯', '精坯'), ('粗坯', '粗坯')], string='坯料类型',
                                        related='product_id.blank_precision')
+    unit_number = fields.Float('单件用量', digits=(16, 3), related='product_id.unit_number')
     embryo_long = fields.Char('坯料尺寸(mm)', related='demand_plan_id.embryo_long')
     materials_id = fields.Char('材料', related='demand_plan_id.materials_id')
     model_machining_precision = fields.Selection(related='product_id.model_machining_precision', string='精度')
@@ -169,22 +170,30 @@ class SfProductionDemandPlan(models.Model):
     finished_product_arrival_date = fields.Date('采购计划到货(成品)')
     bom_id = fields.Many2one('mrp.bom', string="BOM", readonly=True)
     location_id = fields.Many2one('stock.location', string='需求位置', default=get_location_id, readonly=True)
-    manual_quotation = fields.Boolean('人工编程',related='product_id.manual_quotation',default=False)
+    manual_quotation = fields.Boolean('人工编程', related='product_id.manual_quotation', default=False)
+
     @api.constrains('plan_uom_qty')
     def _check_plan_uom_qty(self):
         line_ids = self.filtered(lambda p: p.plan_uom_qty == 0 or p.plan_uom_qty < 0)
         if line_ids:
             raise ValidationError(_("计划量不能小于等于0"))
 
-    @api.constrains('new_supply_method')
-    def _check_new_supply_method(self):
+    @api.constrains('supply_method')
+    def _check_supply_method(self):
         product_name = []
+        product = []
         for line in self:
-            if line.new_supply_method == 'purchase' and line.is_incoming_material:
+            if line.supply_method == 'purchase' and line.is_incoming_material:
                 product_name.append(line.product_id.display_name)
+            if line.supply_method == 'automation' and line.manual_quotation:
+                product.append(line.product_id.display_name)
+
         if product_name:
             unique_product_names = list(set(product_name))
             raise UserError('当前（%s）产品为客供料，不能选择外购' % ','.join(unique_product_names))
+        if product:
+            unique_product = list(set(product))
+            raise UserError('当前（%s）产品为人工编程，不能选择自动化产线加工' % ','.join(unique_product))
 
     @api.depends('new_supply_method')
     def _compute_custom_made_type(self):
@@ -346,7 +355,8 @@ class SfProductionDemandPlan(models.Model):
     def update_sale_order_state(self):
         # demand_plan = self.env['sf.demand.plan'].sudo().search([('sale_order_id', '=', self.sale_order_id.id)])
         # demand_plan_state = demand_plan.filtered(lambda line: line.state != '40')
-        production_demand_plan = self.env['sf.production.demand.plan'].sudo().search([('sale_order_id', '=', self.sale_order_id.id)])
+        production_demand_plan = self.env['sf.production.demand.plan'].sudo().search(
+            [('sale_order_id', '=', self.sale_order_id.id)])
         production_demand_plan_state = production_demand_plan.filtered(lambda line: line.status in ('10', '20', '30'))
         if not production_demand_plan_state:
             # 修改销售订单为加工中
@@ -605,6 +615,11 @@ class SfProductionDemandPlan(models.Model):
         # 按产品分组并计算总数
         product_data = {}
         for plan in filtered_plan:
+            check_overdelivery_allowed = False
+            if not plan.demand_plan_id.overdelivery_allowed:
+                customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
+                if plan.location_id.id == customer_location_id:
+                    check_overdelivery_allowed = True 
             if plan.product_id not in product_data:
                 # 初始化产品数据，从产品上获取需求量
                 product_data[plan.product_id] = {
@@ -614,17 +629,22 @@ class SfProductionDemandPlan(models.Model):
 
             # 累加计划数量
             product_data[plan.product_id]['plan_uom_qty'] += plan.plan_uom_qty
+            product_data[plan.product_id]['overdelivery_allowed'] = check_overdelivery_allowed
         # 检查需求超过计划数量的产品
         warning_messages = []
+        error_messages = []
         for product, data in product_data.items():
-            if float_compare(data['plan_uom_qty'], data['product_uom_qty'],
-                                          precision_rounding=product.uom_id.rounding) == 1:
+            if data['overdelivery_allowed'] and float_compare(data['plan_uom_qty'], data['product_uom_qty'],precision_rounding=product.uom_id.rounding) == 1:
+                error_messages.append(f"您正在下达的产品 {product.display_name},已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
+            elif float_compare(data['plan_uom_qty'], data['product_uom_qty'],
+                             precision_rounding=product.uom_id.rounding) == 1:
                 warning_messages.append(
                     _("您正在下达的产品 %s，计划量%s，需求数量为%s，已超过需求数量") %
                     (product.display_name, data['plan_uom_qty'], data['product_uom_qty'])
                 )
-        if warning_messages and check_overdelivery_allowed:
-            raise ValidationError(f"已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
+        if error_messages:
+            error_message = "\n".join(error_messages)
+            raise ValidationError(error_message)
         elif warning_messages:
             warning_message = "\n".join(warning_messages)
             return {
@@ -642,19 +662,17 @@ class SfProductionDemandPlan(models.Model):
 
     def button_release_plan(self):
         self.ensure_one()
-        if not self.new_supply_method:
-            raise ValidationError(f"供货方式不能为空！")
-        if self.product_id.manual_quotation and self.custom_made_type == 'automation':
-            raise ValidationError(f"产品{self.product_id.name}为人工编程,不能选择自动化产线加工")
         check_overdelivery_allowed = False
         if not self.demand_plan_id.overdelivery_allowed:
             customer_location_id = self.env['ir.model.data']._xmlid_to_res_id('stock.stock_location_customers')
             if self.location_id.id == customer_location_id:
                 check_overdelivery_allowed = True
         if check_overdelivery_allowed:
-            if float_compare(self.plan_uom_qty, self.product_uom_qty,precision_rounding=self.product_id.uom_id.rounding) == 1:
+            if float_compare(self.plan_uom_qty, self.product_uom_qty,
+                             precision_rounding=self.product_id.uom_id.rounding) == 1:
                 raise ValidationError(f"已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
-        elif float_compare(self.plan_uom_qty, self.product_uom_qty,precision_rounding=self.product_id.uom_id.rounding) == 1:
+        elif float_compare(self.plan_uom_qty, self.product_uom_qty,
+                           precision_rounding=self.product_id.uom_id.rounding) == 1:
             return {
                 'name': _('需求计划'),
                 'type': 'ir.actions.act_window',

sf_demand_plan/views/demand_plan.xml

@@ -39,6 +39,7 @@
                 <field name="blank_type" optional="hide"/>
                 <field name="blank_precision"/>
                 <field name="embryo_long"/>
+                <field name="unit_number" optional="hide"/>
                 <field name="materials_id"/>
                 <field name="model_machining_precision"/>
                 <field name="model_process_parameters_ids" widget="many2many_tags"/>

sf_dlm_management/views/product_template_management_view.xml

@@ -513,112 +513,191 @@
                         </notebook>
                     </page>
                     <page string="夹具物料参数" attrs="{'invisible': [('categ_type', '!=', '夹具')]}">
-                        <group>
                             <group>
-                                <field name="brand_id" placeholder="请选择" options="{'no_create': True}"/>
-                                <field name="multi_mounting_type_id" placeholder="请选择" options="{'no_create': True}"
-                                       attrs="{'required': [('categ_type', '=', '夹具')]}"/>
-                                <field name="length" string="长度(mm)"/>
-                                <field name="width" string="宽度(mm)"/>
-                                <field name="height" string="高度(mm)"/>
-                                <field name="height_tolerance_value"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸夹具'])]}"/>
-                                <field name="diameter"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘', '零点托盘', '三爪卡盘'])]}"/>
-                                <field name="weight"/>
-                                <field name="chucking_power_max"
-                                       attrs="{'invisible': [('fixture_material_type', '=','磁吸夹具')]}"/>
-                                <field name="carrying_capacity_max"/>
-                                <field name="rigidity"/>
+                                   <group>
+                                   <field name="brand_id" placeholder="请选择" options="{'no_create': True}"/>
+                                   <field name="multi_mounting_type_id" placeholder="请选择" options="{'no_create': True}"
+                                          attrs="{'required': [('categ_type', '=', '夹具')]}"/>
+                                   <field name="length" string="长度(mm)"/>
+                                   <field name="width" string="宽度(mm)"/>
+                                   <field name="height" string="高度(mm)"/>
+                                   <field name="height_tolerance_value"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸夹具'])]}"/>
+                                   <field name="diameter"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘', '零点托盘', '三爪卡盘', '磁吸托盘', '气吸托盘'])]}"/>
+                                   <field name="weight"/>
+                                   <field name="chucking_power_max"
+                                          attrs="{'invisible': [('fixture_material_type', '=','磁吸夹具')]}"/>
+                                   <field name="carrying_capacity_max"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸夹具'])]}"/>
+                                   <field name="rigidity"/>
+                                   </group>
+                                   <group>
+                                   <!-- 夹持工件尺寸 -->
+                                   <label for="gripper_length_min" string="夹持工件最小尺寸"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
+                                   <div class="o_address_format"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}">
+                                          <label for="gripper_length_min" string="长"/>
+                                          <field name="gripper_length_min" class="o_address_zip"/>
+                                          <span>&amp;nbsp;</span>
+                                          <label for="gripper_width_min" string="宽"/>
+                                          <field name="gripper_width_min" class="o_address_zip"/>
+                                          <span>&amp;nbsp;</span>
+                                          <label for="gripper_height_min" string="高"/>
+                                          <field name="gripper_height_min" class="o_address_zip"/>
+                                   </div>
+                                   <label for="gripper_length_max" string="夹持工件最大尺寸"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
+                                   <div class="o_address_format"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}">
+                                          <label for="gripper_length_max" string="长"/>
+                                          <field name="gripper_length_max" class="o_address_zip"/>
+                                          <span>&amp;nbsp;</span>
+                                          <label for="gripper_width_max" string="宽"/>
+                                          <field name="gripper_width_max" class="o_address_zip"/>
+                                          <span>&amp;nbsp;</span>
+                                          <label for="gripper_height_max" string="高"/>
+                                          <field name="gripper_height_max" class="o_address_zip"/>
+                                   </div>
+
+                                   <field name="gripper_diameter_min" string="夹持工件最小直径(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
+                                   <field name="gripper_diameter_max" string="夹持工件最大直径(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
+                                   <field name="clamping_diameter" string="装夹直径(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘','零点托盘'])]}"/>
+                                   <field name="clamping_num" placeholder="请选择" string="装夹单元数"
+                                          attrs="{'invisible': [('fixture_material_type', '!=', '零点卡盘')]}"/>
+                                   <field name="repeated_positioning_accuracy" placeholder="请输入重复定位孔精度"
+                                          string="重复定位精度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘','零点托盘'])]}"/>
+                                   <field name="orientation_dish_diameter" string="定位盘直径(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘'])]}"/>
+                                   <field name="boolean_transposing_hole" string="是否有转位孔"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘'])]}"/>
+                                   <field name="connector_diameter" placeholder="请选择" string="连接头直径(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点托盘'])]}"/>
+                                   <field name="way_to_install" placeholder="请选择" string="安装方式"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点托盘','气吸托盘'])]}"/>
+                                   <field name="rated_air_pressure" string="额定气压(Mpa)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具'])]}"/>
+
+                                   <field name="transverse_groove" string="横向配合槽n(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['虎钳夹具'])]}"/>
+                                   <field name="longitudinal_fitting_groove" string="纵向配合槽l(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['虎钳夹具'])]}"/>
+
+                                   <field name="rated_adsorption_force" string="额定吸附力(N/cm²)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸夹具'])]}"/>
+                                   <field name="magnetic_field_height" string="磁场高度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸夹具'])]}"/>
+                                   <field name="magnetic_pole_plate_grinding_allowance" string="磁极板磨削余量(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸夹具'])]}"/>
+
+                                   <!-- 磁吸托盘字段 -->
+                                   <field name="magnet_tray_length" string="磁吸托盘长度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+                                   <field name="magnet_tray_width" string="磁吸托盘宽度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+                                   <field name="magnet_tray_height" string="磁吸托盘厚度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+                                   <field name="magnet_tray_diameter" string="磁吸托盘直径(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+                                   <field name="magnet_tray_weight" string="磁吸托盘重量(kg)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+
+                                   <field name="magnet_max_adsorp_length" string="磁吸托盘最大吸附长度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+                                   <field name="magnet_max_adsorp_width" string="磁吸托盘最大吸附宽度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+                                   <field name="magnet_max_adsorp_height" string="磁吸托盘最大吸附厚度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+                                   <field name="magnet_max_adsorp_diameter" string="磁吸托盘最大吸附直径(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+                                   <field name="magnet_max_adsorp_force" string="磁吸托盘最大吸附力(N)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+
+                                   <field name="magnet_unlocking_method" string="磁吸托盘锁紧方式"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+                                   <field name="magnet_flatness" string="磁吸托盘平面精度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+                                   <field name="magnet_max_load" string="磁吸托盘最大负载(kg)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸托盘'])]}"/>
+
+                                   <!-- 气吸托盘字段 -->
+                                   <field name="air_tray_length" string="气吸托盘长度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+                                   <field name="air_tray_width" string="气吸托盘宽度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+                                   <field name="air_tray_height" string="气吸托盘高度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+                                   <field name="air_tray_diameter" string="气吸托盘直径(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+                                   <field name="air_tray_weight" string="气吸托盘重量(kg)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+
+                                   <field name="air_max_adsorp_length" string="气吸托盘最大吸附长度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+                                   <field name="air_max_adsorp_width" string="气吸托盘最大吸附宽度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+                                   <field name="air_max_adsorp_height" string="气吸托盘最大吸附高度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+                                   <field name="air_max_adsorp_diameter" string="气吸托盘最大吸附直径(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+                                   <field name="air_max_adsorp_force" string="气吸托盘最大吸附力(N)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+
+                                   <field name="air_unlocking_method" string="气吸托盘锁紧方式"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+                                   <field name="air_flatness" string="气吸托盘平面精度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+                                   <field name="air_max_load" string="气吸托盘最大负载(kg)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+                                   <field name="air_boolean_chip_blowing_function" string="气吸托盘是否有吹屑功能"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+                                   <field name="air_way_to_install" string="气吸托盘安装方式"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气吸托盘'])]}"/>
+                                   
+                                   <!-- 定位隔板字段 -->
+                                   <field name="length_outer" string="外框长(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['定位隔板'])]}"/>
+                                   <field name="width_outer" string="外框宽(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['定位隔板'])]}"/>
+                                   <field name="length_inner" string="内框长(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['定位隔板'])]}"/>
+                                   <field name="width_inner" string="内框宽(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['定位隔板'])]}"/>
+                                   <field name="thickness" string="厚度(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['定位隔板'])]}"/>
+                                   <field name="unit_location" string="定位单元位置"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['定位隔板'])]}"/>
+                                   <field name="offset_x" string="X方向偏移(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['定位隔板'])]}"/>
+                                   <field name="offset_y" string="Y方向偏移(mm)"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['定位隔板'])]}"/>
+                                   <field name="materials_model_id_positioning" string="材质"
+                                          placeholder="请选择" options="{'no_create': True}"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['定位隔板'])]}"/>
+                                   <field name="station_count" string="定位单元数"
+                                          attrs="{'readonly': True, 'invisible': [('fixture_material_type', 'not in', ['定位隔板'])]}"/>
+
+                                   <field name="boolean_chip_blowing_function" string="是否有吹屑功能"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘','零点托盘','气吸托盘'])]}"/>
+                                   <field name="materials_model_id" placeholder="请选择" options="{'no_create': True}"/>
+                                   <field name="interface_materials_model_id" placeholder="请选择" string="接口类型"
+                                          options="{'no_create': True}"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具'])]}"/>
+                                   <field name="type_of_drive" placeholder="请选择" string="驱动方式"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点托盘','气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
+                                   <field name="unlocking_method" string="解锁方式" placeholder="请选择"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘','气吸托盘', '磁吸托盘'])]}"/>
+                                   <field name="machine_tool_type_id" string="适用机床型号" placeholder="请选择"
+                                          options="{'no_create': True}"
+                                          attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘'])]}"/>
+                                   </group>
                             </group>
-                            <group>
-                                <label for="gripper_length_min" string="夹持工件最小尺寸"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
-                                <div class="o_address_format"
-                                     attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}">
-                                    <label for="gripper_length_min" string="长"/>
-                                    <field name="gripper_length_min" class="o_address_zip"/>
-                                    <span>&amp;nbsp;</span>
-                                    <label for="gripper_width_min" string="宽"/>
-                                    <field name="gripper_width_min" class="o_address_zip"/>
-                                    <span>&amp;nbsp;</span>
-                                    <label for="gripper_height_min" string="高"/>
-                                    <field name="gripper_height_min" class="o_address_zip"/>
-                                </div>
-                                <label for="gripper_length_max" string="夹持工件最大尺寸"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
-                                <div class="o_address_format"
-                                     attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}">
-                                    <label for="gripper_length_max" string="长"/>
-                                    <field name="gripper_length_max" class="o_address_zip"/>
-                                    <span>&amp;nbsp;</span>
-                                    <label for="gripper_width_max" string="宽"/>
-                                    <field name="gripper_width_max" class="o_address_zip"/>
-                                    <span>&amp;nbsp;</span>
-                                    <label for="gripper_width_max" string="高"/>
-                                    <field name="gripper_width_max" class="o_address_zip"/>
-                                </div>
-                                <field name="gripper_diameter_min" string="夹持工件最小直径(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
-                                <field name="gripper_diameter_max" string="夹持工件最大直径(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
-                                <field name="clamping_diameter" string="装夹直径(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘','零点托盘'])]}"/>
-                                <field name="clamping_num" placeholder="请选择" string="装夹单元数"
-                                       attrs="{'invisible': [('fixture_material_type', '!=', '零点卡盘')]}"/>
-                                <field name="repeated_positioning_accuracy" placeholder="请输入重复定位孔精度"
-                                       string="重复定位精度(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘','零点托盘'])]}"/>
-                                <field name="orientation_dish_diameter" string="定位盘直径(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘'])]}"/>
-                                <field name="boolean_transposing_hole" string="是否有转位孔"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘'])]}"/>
-                                <field name="connector_diameter" placeholder="请选择" string="连接头直径(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点托盘'])]}"/>
-                                <field name="way_to_install" placeholder="请选择" string="安装方式"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点托盘'])]}"/>
-                                <field name="rated_air_pressure" string="额定气压(Mpa)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具'])]}"/>
-
-                                <field name="transverse_groove" string="横向配合槽n(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['虎钳夹具'])]}"/>
-                                <field name="longitudinal_fitting_groove" string="纵向配合槽l(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['虎钳夹具'])]}"/>
-
-                                <field name="rated_adsorption_force" string="额定吸附力(N/cm²)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸夹具'])]}"/>
-                                <field name="magnetic_field_height" string="磁场高度(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸夹具'])]}"/>
-                                <field name="magnetic_pole_plate_grinding_allowance" string="磁极板磨削余量(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['磁吸夹具'])]}"/>
-
-                                <field name="screw_size" string="螺牙大小(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['转接板(锁板)夹具'])]}"/>
-                                <field name="via_hole_diameter" string="过孔直径(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['转接板(锁板)夹具'])]}"/>
-
-                                <field name="mounting_hole_depth" string="安装孔深度(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['三爪卡盘'])]}"/>
-                                <field name="centering_diameter" string="定心直径(mm)"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['三爪卡盘'])]}"/>
-
-                                <field name="boolean_chip_blowing_function" string="是否有吹屑功能"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘','零点托盘'])]}"/>
-                                <field name="materials_model_id" placeholder="请选择" options="{'no_create': True}"/>
-                                <field name="interface_materials_model_id" placeholder="请选择" string="接口类型"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具'])]}"/>
-                                <field name="type_of_drive" placeholder="请选择" string="驱动方式"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点托盘','气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
-                                <field name="unlocking_method" string="解锁方式" placeholder="请选择"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘'])]}"/>
-                                <field name="machine_tool_type_id" string="适用机床型号" placeholder="请选择"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘'])]}"/>
-
-                            </group>
-                        </group>
-                    </page>
+                     </page>
                 </xpath>
             </field>
         </record>

sf_manufacturing/models/product_template.py

@@ -1215,9 +1215,69 @@ class ResProductFixture(models.Model):
     mounting_hole_depth = fields.Float('安装孔深度(mm)', digits=(16, 2))
     centering_diameter = fields.Float('定心直径(mm)', digits=(16, 2))
 
+    # ‘磁吸托盘’ 字段
+    magnet_tray_length = fields.Float('磁吸托盘长度(mm)', digits=(16, 2))
+    magnet_tray_width = fields.Float('磁吸托盘宽度(mm)', digits=(16, 2))
+    magnet_tray_height = fields.Float('磁吸托盘厚度(mm)', digits=(16, 2))
+    magnet_tray_diameter = fields.Float('磁吸托盘直径(mm)', digits=(16, 2))
+    magnet_tray_weight = fields.Float('磁吸托盘重量(kg)', digits=(16, 2))
+
+    magnet_max_adsorp_length = fields.Float('磁吸托盘最大吸附长度(mm)', digits=(16, 2))
+    magnet_max_adsorp_width = fields.Float('磁吸托盘最大吸附宽度(mm)', digits=(16, 2))
+    magnet_max_adsorp_height = fields.Float('磁吸托盘最大吸附厚度(mm)', digits=(16, 2))
+    magnet_max_adsorp_diameter = fields.Float('磁吸托盘最大吸附直径(mm)', digits=(16, 2))
+    magnet_max_adsorp_force = fields.Float('磁吸托盘最大吸附力(N)', digits=(16, 2))
+
+    magnet_unlocking_method = fields.Selection(
+        [('手动', '手动'), ('气动', '气动'), ('液压', '液压'), ('电动', '电动'), ('其他', '其他')],
+        string='磁吸托盘锁紧方式'
+    )
+    magnet_flatness = fields.Char('磁吸托盘平面精度(mm)', size=20)
+    magnet_max_load = fields.Float('磁吸托盘最大负载(kg)', digits=(16, 2))
+
+    # 定位隔板字段
+    length_outer = fields.Float('外框长(mm)', digits=(16, 2))
+    width_outer = fields.Float('外框宽(mm)', digits=(16, 2))
+    length_inner = fields.Float('内框长(mm)', digits=(16, 2))
+    width_inner = fields.Float('内框宽(mm)', digits=(16, 2))
+    thickness = fields.Float('厚度(mm)', digits=(16, 2))
+
+    unit_location = fields.Char('定位单元位置')
+    offset_x = fields.Float('X方向偏移(mm)', digits=(16, 2))
+    offset_y = fields.Float('Y方向偏移(mm)', digits=(16, 2))
+
+    materials_model_id_positioning = fields.Many2one(
+        'sf.materials.model', string='材质', ondelete='set null', index=True)
+    station_count = fields.Integer('定位单元数', readonly=True)
+
+    # ‘气吸托盘’ 字段
+    air_tray_length = fields.Float('气吸托盘长度(mm)', digits=(16, 2))
+    air_tray_width = fields.Float('气吸托盘宽度(mm)', digits=(16, 2))
+    air_tray_height = fields.Float('气吸托盘高度(mm)', digits=(16, 2))
+    air_tray_diameter = fields.Float('气吸托盘直径(mm)', digits=(16, 2))
+    air_tray_weight = fields.Float('气吸托盘重量(kg)', digits=(16, 2))
+
+    air_max_adsorp_length = fields.Float('气吸托盘最大吸附长度(mm)', digits=(16, 2))
+    air_max_adsorp_width = fields.Float('气吸托盘最大吸附宽度(mm)', digits=(16, 2))
+    air_max_adsorp_height = fields.Float('气吸托盘最大吸附厚度(mm)', digits=(16, 2))
+    air_max_adsorp_diameter = fields.Float('气吸托盘最大吸附直径(mm)', digits=(16, 2))
+    air_max_adsorp_force = fields.Float('气吸托盘最大吸附力(N)', digits=(16, 2))
+
+    air_unlocking_method = fields.Selection(
+        [('手动', '手动'), ('气动', '气动'), ('液压', '液压'), ('电动', '电动'), ('其他', '其他')],
+        string='气吸托盘锁紧方式'
+    )
+    air_flatness = fields.Char('气吸托盘平面精度(mm)', size=20)
+    air_max_load = fields.Float('气吸托盘最大负载(kg)', digits=(16, 2))
+    air_boolean_chip_blowing_function = fields.Boolean('气吸托盘是否有吹屑功能')
+    air_way_to_install = fields.Selection(
+        [('接口式', '接口式'), ('螺栓固定', '螺栓固定'), ('磁吸式', '磁吸式'), ('其他', '其他')],
+        string='气吸托盘安装方式'
+    )
+
     @api.onchange('specification_fixture_id')
     def _onchange_specification_fixture_id(self):
-        if self.specification_fixture_id:
+        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
@@ -1258,7 +1318,46 @@ class ResProductFixture(models.Model):
             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
-
+            self.magnet_tray_length = self.specification_fixture_id.magnet_tray_length
+            self.magnet_tray_width = self.specification_fixture_id.magnet_tray_width
+            self.magnet_tray_height = self.specification_fixture_id.magnet_tray_height
+            self.magnet_tray_diameter = self.specification_fixture_id.magnet_tray_diameter
+            self.magnet_tray_weight = self.specification_fixture_id.magnet_tray_weight
+            self.magnet_max_adsorp_length = self.specification_fixture_id.magnet_max_adsorp_length
+            self.magnet_max_adsorp_width = self.specification_fixture_id.magnet_max_adsorp_width
+            self.magnet_max_adsorp_height = self.specification_fixture_id.magnet_max_adsorp_height
+            self.magnet_max_adsorp_diameter = self.specification_fixture_id.magnet_max_adsorp_diameter
+            self.magnet_max_adsorp_force = self.specification_fixture_id.magnet_max_adsorp_force
+            self.magnet_unlocking_method = self.specification_fixture_id.magnet_unlocking_method
+            self.magnet_flatness = self.specification_fixture_id.magnet_flatness
+            self.magnet_max_load = self.specification_fixture_id.magnet_max_load
+            # 定位隔板字段
+            self.length_outer = self.specification_fixture_id.length_outer
+            self.width_outer = self.specification_fixture_id.width_outer
+            self.length_inner = self.specification_fixture_id.length_inner
+            self.width_inner = self.specification_fixture_id.width_inner
+            self.thickness = self.specification_fixture_id.thickness
+            self.unit_location = self.specification_fixture_id.unit_location
+            self.offset_x = self.specification_fixture_id.offset_x
+            self.offset_y = self.specification_fixture_id.offset_y
+            self.materials_model_id_positioning = self.specification_fixture_id.materials_model_id_positioning
+            self.station_count = self.specification_fixture_id.station_count
+            # 气吸托盘字段
+            self.air_tray_length = self.specification_fixture_id.air_tray_length
+            self.air_tray_width = self.specification_fixture_id.air_tray_width
+            self.air_tray_height = self.specification_fixture_id.air_tray_height
+            self.air_tray_diameter = self.specification_fixture_id.air_tray_diameter
+            self.air_tray_weight = self.specification_fixture_id.air_tray_weight
+            self.air_max_adsorp_length = self.specification_fixture_id.air_max_adsorp_length
+            self.air_max_adsorp_width = self.specification_fixture_id.air_max_adsorp_width
+            self.air_max_adsorp_height = self.specification_fixture_id.air_max_adsorp_height
+            self.air_max_adsorp_diameter = self.specification_fixture_id.air_max_adsorp_diameter
+            self.air_max_adsorp_force = self.specification_fixture_id.air_max_adsorp_force
+            self.air_unlocking_method = self.specification_fixture_id.air_unlocking_method
+            self.air_flatness = self.specification_fixture_id.air_flatness
+            self.air_max_load = self.specification_fixture_id.air_max_load
+            self.air_boolean_chip_blowing_function = self.specification_fixture_id.air_boolean_chip_blowing_function
+            self.air_way_to_install = self.specification_fixture_id.air_way_to_install
 
 class SfMaintenanceEquipmentAndProductTemplate(models.Model):
     _inherit = 'maintenance.equipment'

sf_mrs_connect/models/sync_common.py

@@ -9,6 +9,7 @@ from odoo import models
 from odoo.exceptions import ValidationError
 from odoo.addons.sf_base.commons.common import Common
 
+
 _logger = logging.getLogger(__name__)
 
 
@@ -1610,6 +1611,12 @@ class SyncfixtureMaterialsBasicParameters(models.Model):
                     self._write_or_create(all_list.get('adapter_board_yesterday_list'), '转接板(锁板)夹具')
                 if all_list.get('scroll_chuck_all_list'):
                     self._write_or_create(all_list.get('scroll_chuck_yesterday_list'), '三爪卡盘')
+                if all_list.get('air_blow_tray_all_list'):
+                    self._write_or_create(all_list.get('air_tray_yesterday_list'), '气吸托盘')
+                if all_list.get('magnet_tray_all_list'):
+                    self._write_or_create(all_list.get('magnet_tray_yesterday_list'), '磁吸托盘')
+                if all_list.get('positioning_partition_all_list'):
+                    self._write_or_create(all_list.get('positioning_partition_all_list'), '定位隔板')
         else:
             raise ValidationError("夹具型号基本参数认证未通过")
 
@@ -1638,6 +1645,12 @@ class SyncfixtureMaterialsBasicParameters(models.Model):
                     self._write_or_create(all_list.get('adapter_board_all_list'), '转接板(锁板)夹具')
                 if all_list.get('scroll_chuck_all_list'):
                     self._write_or_create(all_list.get('scroll_chuck_all_list'), '三爪卡盘')
+                if all_list.get('air_blow_tray_all_list'):
+                    self._write_or_create(all_list.get('air_tray_all_list'), '气吸托盘')
+                if all_list.get('magnet_tray_all_list'):
+                    self._write_or_create(all_list.get('magnet_tray_all_list'), '磁吸托盘')
+                if all_list.get('positioning_partition_all_list'):
+                    self._write_or_create(all_list.get('positioning_partition_all_list'), '定位隔板')
         else:
             raise ValidationError("夹具型号基本参数认证未通过")
 
@@ -3230,4 +3243,4 @@ class EmbryoRedundancySync(models.Model):
                         "height": item['height'],
                         "active": item['active'],
                         "remark": item['remark'],
-                    })
+                    })