Accept Merge Request #2293: (feature/7254_new -> develop)

Merge Request: 材料型号增加是否磁吸

Created By: @刘磊
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @刘磊
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2293

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/__manifest__.py

@@ -35,7 +35,6 @@
         ],
         'web.assets_backend': [
             'sf_base/static/src/scss/*.scss',
-            'sf_base/static/src/js/*.js',
         ],
 
     },

sf_base/models/basic_parameters_fixture.py

@@ -67,6 +67,52 @@ 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))
+
+    # ‘气吸托盘’ 字段
+    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 +131,10 @@ 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_air_tray_param(fixture_materials_data)
         return {}
 
     def _json_zero_chuck_param(self, obj):
@@ -284,3 +334,57 @@ 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_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/common.py

@@ -42,6 +42,7 @@ class MrsMaterialModel(models.Model):
     materials_num = fields.Char("编码号")
     name = fields.Char('型号名')
     need_h = fields.Boolean("热处理", default="false")
+    need_m = fields.Boolean("是否磁吸", default="false")
     mf_materia_post = fields.Char("热处理后密度")
     density = fields.Float("密度(kg/m³)")
     materials_id = fields.Many2one('sf.production.materials', "材料名")

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,14 @@ 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='磁吸托盘基本参数')
     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/static/src/js/custom_barcode_handlers.js

@@ -1,62 +0,0 @@
-/** @odoo-module **/
-
-import { registry } from "@web/core/registry";
-import { barcodeGenericHandlers } from '@barcodes/barcode_handlers';
-import { patch } from "@web/core/utils/patch";
-
-// 定义新的 clickOnButton 函数
-function customClickOnButton(selector) {
-    console.log("This is the custom clickOnButton function!");
-
-    const buttons = document.body.querySelectorAll(selector);
-
-    let length = buttons.length;
-    if (length > 0) {
-        buttons[length - 1].click();
-    } else {
-        console.warn(`Button with selector ${selector} not found`);
-    }
-}
-
-patch(barcodeGenericHandlers, "start", {
-    start(env, { ui, barcode, notification }) {
-        // 使用新定义的 clickOnButton 函数
-        const COMMANDS = {
-            "O-CMD.EDIT": () => customClickOnButton(".o_form_button_edit"),
-            "O-CMD.DISCARD": () => customClickOnButton(".o_form_button_cancel"),
-            "O-CMD.SAVE": () => customClickOnButton(".o_form_button_save"),
-            "O-CMD.PREV": () => customClickOnButton(".o_pager_previous"),
-            "O-CMD.NEXT": () => customClickOnButton(".o_pager_next"),
-            "O-CMD.PAGER-FIRST": () => updatePager("first"),
-            "O-CMD.PAGER-LAST": () => updatePager("last"),
-            "O-CMD.CONFIRM": () => customClickOnButton(".jikimo_button_confirm"),
-            "O-CMD.FLUSHED": () => customClickOnButton(".jikimo_button_flushed"),
-        };
-
-        barcode.bus.addEventListener("barcode_scanned", (ev) => {
-            const barcode = ev.detail.barcode;
-            if (barcode.startsWith("O-BTN.")) {
-                let targets = [];
-                try {
-                    targets = getVisibleElements(ui.activeElement, `[barcode_trigger=${barcode.slice(6)}]`);
-                } catch (_e) {
-                    console.warn(`Barcode '${barcode}' is not valid`);
-                }
-                for (let elem of targets) {
-                    elem.click();
-                }
-            }
-            if (barcode.startsWith("O-CMD.")) {
-                const fn = COMMANDS[barcode];
-                if (fn) {
-                    fn();
-                } else {
-                    notification.add(env._t("Barcode: ") + `'${barcode}'`, {
-                        title: env._t("Unknown barcode command"),
-                        type: "danger"
-                    });
-                }
-            }
-        });
-    }
-})

sf_base/static/src/js/remove_focus.js

@@ -1,42 +0,0 @@
-/** @odoo-module **/
-
-import { registry } from '@web/core/registry';
-
-import { formView } from '@web/views/form/form_view';
-import { FormController } from '@web/views/form/form_controller';
-
-import { listView } from '@web/views/list/list_view';
-import { ListController } from '@web/views/list/list_controller'
-
-import { onRendered, onMounted } from "@odoo/owl";
-
-export class RemoveFocusFormController extends FormController {
-    setup() {
-        super.setup();
-
-        onMounted(() => {
-            this.__owl__.bdom.el.querySelectorAll(':focus').forEach(element => element.blur());
-        })
-    }
-}
-
-registry.category('views').add('remove_focus_form_view', {
-    ...formView,
-    Controller: RemoveFocusFormController,
-});
-
-
-export class RemoveFocusListController extends ListController {
-    setup() {
-        super.setup();
-
-        onMounted(() => {
-            this.__owl__.bdom.el.querySelectorAll(':focus').forEach(element => element.blur());
-        })
-    }
-}
-
-registry.category('views').add('remove_focus_list_view', {
-    ...listView,
-    Controller: RemoveFocusListController,
-});

sf_base/views/common_view.xml

@@ -263,6 +263,7 @@
                                 <field name="materials_no" readonly="1" force_save="1"/>
                                 <field name="gain_way" required="0"/>
                                 <field name="density" readonly="1" required="1"  class="custom_required"/>
+                                <field name="need_m" default="false" readonly="1"/>
                             </group>
                             <group>
                                 <field name="rough_machining" required="1"/>
@@ -306,6 +307,7 @@
                     <field name="tensile_strength"/>
                     <field name="hardness" optional="show"/>
                     <field name="need_h"/>
+                    <field name="need_m"/>
                     <field name="apply" widget="many2many_tags" optional="show"/>
                     <field name="density" optional="show"/>
                     <field name="rough_machining" optional="hide"/>
@@ -352,6 +354,7 @@
                                             <field name="materials_no"/>
                                             <field name="name"/>
                                             <field name="need_h"/>
+                                            <field name="need_m"/>
                                             <field name="mf_materia_post"/>
                                             <field name="density"/>
                                             <field name='materials_id' default="default" invisible="1"/>

sf_base/views/fixture_view.xml

@@ -328,6 +328,52 @@
                                     <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="scroll_chuck_ids"
                                    attrs="{'invisible': [('fixture_material_type', '!=', '三爪卡盘')]}">
                                 <tree editable="bottom" class="center" delete="0">

sf_demand_plan/models/sf_demand_plan.py

@@ -222,10 +222,15 @@ 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')
-        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:
-                raise ValidationError(f"已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
+        check_overdelivery_allowed = False
+        for line in line_ids:
+            if line.location_id.id == customer_location_id:
+                if not self.overdelivery_allowed:
+                    if float_compare(sum_product_uom_qty, self.product_uom_qty,
+                                     precision_rounding=line.product_id.uom_id.rounding) == 1:
+                        check_overdelivery_allowed = True                
+        if check_overdelivery_allowed:
+             raise ValidationError(f"已禁止向合作伙伴/客户超量发货，请更换“补货原因”或将“可超量发货”设置为“是”。")
         elif float_compare(sum_product_uom_qty, self.product_uom_qty,
                            precision_rounding=self.product_id.uom_id.rounding) == 1:
             return {

sf_dlm_management/views/product_template_management_view.xml

@@ -513,112 +513,168 @@
                         </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="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/__manifest__.py

@@ -11,7 +11,7 @@
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
     'depends': ['sf_base', 'sf_maintenance', 'web_widget_model_viewer', 'sf_warehouse', 'jikimo_attachment_viewer',
-                'jikimo_sale_multiple_supply_methods', 'product'],
+                'jikimo_sale_multiple_supply_methods', 'product', 'jikimo_tree_header_buttons_always_visible'],
     'data': [
         'data/cron_data.xml',
         'data/stock_data.xml',

sf_manufacturing/models/product_template.py

@@ -1215,6 +1215,51 @@ 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))
+
+    # ‘气吸托盘’ 字段
+    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:

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__)
 
 
@@ -178,6 +179,7 @@ class sfMaterialModel(models.Model):
                         materials_model.mf_materia_post = item['mf_materia_post']
                         materials_model.materials_id = materials.id
                         materials_model.need_h = item['need_h']
+                        materials_model.need_m = item['need_m']
                         materials_model.density = item['density']
                         materials_model.active = item['active']
                     else:
@@ -192,6 +194,7 @@ class sfMaterialModel(models.Model):
                             "active": item['active'],
                             "materials_id": materials.id,
                             "need_h": item['need_h'],
+                            "need_m": item['need_m'],
                             "mf_materia_post": item['mf_materia_post'],
                             "density": item['density'],
                         })
@@ -228,6 +231,7 @@ class sfMaterialModel(models.Model):
                             "standards_id": self.env['sf.international.standards'].search(
                                 [("name", '=', item['standards_id'])]).id,
                             "need_h": item['need_h'],
+                            "need_m": item['need_m'],
                             "alloy_code": item['alloy_code'],
                             "mf_materia_post": item['mf_materia_post'],
                             "density": item['density'],
@@ -248,6 +252,7 @@ class sfMaterialModel(models.Model):
                         materials_model.mf_materia_post = item['mf_materia_post']
                         materials_model.materials_id = materials.id
                         materials_model.need_h = item['need_h']
+                        materials_model.need_m = item['need_m']
                         materials_model.density = item['density']
                         materials_model.active = item['active']
                         materials_model.materials_code= item['materials_code']
@@ -1610,6 +1615,10 @@ 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'), '磁吸托盘')
         else:
             raise ValidationError("夹具型号基本参数认证未通过")
 
@@ -1638,6 +1647,10 @@ 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'), '磁吸托盘')
         else:
             raise ValidationError("夹具型号基本参数认证未通过")
 
@@ -3230,4 +3243,4 @@ class EmbryoRedundancySync(models.Model):
                         "height": item['height'],
                         "active": item['active'],
                         "remark": item['remark'],
-                    })
+                    })

sf_plan_management/i18n/zh_CN.po

@@ -45759,6 +45759,11 @@ msgstr ""
 msgid "热处理"
 msgstr ""
 
+#. module: sf_base
+#: model:ir.model.fields,field_description:sf_base.field_sf_materials_model__need_m
+msgid "是否磁吸"
+msgstr ""
+
 #. module: sf_base
 #: model:ir.model.fields,field_description:sf_base.field_sf_materials_model__mf_materia_post
 msgid "热处理后密度"

sf_sale/models/sale_order.py

@@ -155,7 +155,7 @@ class ReSaleOrder(models.Model):
             'glb_url': item['glb_url'],
             'remark': item.get('remark'),
             'embryo_redundancy_id': item.get('embryo_redundancy_id'),
-            'is_incoming_material': True if item.get('embryo_redundancy_id') else False,
+            'is_incoming_material': True if item.get('incoming_size') else False,
             'manual_quotation': item.get('manual_quotation'),
             'model_id': item['model_id'],
             'delivery_end_date': item['delivery_end_date']
@@ -287,7 +287,7 @@ class ResaleOrderLine(models.Model):
     check_status = fields.Selection(related='order_id.check_status')
     remark = fields.Char('备注')
 
-    is_incoming_material = fields.Boolean('客供料', compute='_compute_is_incoming_material', store=True)
+    is_incoming_material = fields.Boolean('客供料',  store=True)
     embryo_redundancy_id = fields.Many2one('sf.embryo.redundancy', '坯料冗余')
     manual_quotation = fields.Boolean('人工编程', default=False)
     model_url = fields.Char('模型文件地址')