From b49b5890a0cfb2e1e04a96976eb5681a97d56230 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 20 Nov 2023 17:36:13 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=BA=E5=8F=B0=E6=8D=A2=E5=88=80?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8F=8A=E5=85=B6=E5=BC=B9=E7=AA=97=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=94=9F=E4=BA=A7=E7=BA=BF=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?2=E3=80=81=E6=9C=BA=E5=8F=B0=E6=8D=A2=E5=88=80=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7tree=E8=A7=86=E5=9B=BE=E6=90=9C=E7=B4=A2=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E6=94=B9=E4=B8=BA=E6=8C=89=E7=94=9F=E4=BA=A7=E7=BA=BF?=
 =?UTF-8?q?=E5=92=8C=E7=8A=B6=E6=80=81=E6=90=9C=E7=B4=A2=EF=BC=8C3?=
 =?UTF-8?q?=E3=80=81=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E7=BB=84=E8=A3=85=E5=8D=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=A4=A7?=
 =?UTF-8?q?=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96tree?=
 =?UTF-8?q?=E8=AF=95=E5=9B=BE=E5=B8=83=E5=B1=80=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?form=E8=A7=86=E5=9B=BE=E5=B8=83=E5=B1=80=EF=BC=8Ctree=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E6=90=9C=E7=B4=A2=E9=9D=A2=E6=9D=BF=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8C=89=E7=8A=B6=E6=80=81=E6=90=9C=E7=B4=A2=EF=BC=8C4?=
 =?UTF-8?q?=E3=80=81=E9=87=8D=E6=9E=84=E4=BA=86=E6=9C=BA=E5=8F=B0=E6=8D=A2?=
 =?UTF-8?q?=E5=88=80=E7=94=B3=E8=AF=B7=E6=A8=A1=E5=9E=8B=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=8D=A2=E5=88=80=E5=8A=9F=E8=83=BD=EF=BC=9B5=E3=80=81?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=88=80=E5=85=B7=E8=BD=AC=E7=A7=BB=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/base.py            |  92 ++--
 sf_tool_management/views/tool_base_views.xml | 487 +++++++++++--------
 sf_tool_management/wizard/wizard.py          | 104 ++--
 sf_tool_management/wizard/wizard_view.xml    |  46 +-
 4 files changed, 436 insertions(+), 293 deletions(-)

diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 5f275253..4cbfbe06 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -444,8 +444,9 @@ class MachineTableToolChangingApply(models.Model):
 
     name = fields.Char('名称', related='maintenance_equipment_id.name', store=True)
     maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', required=True, readonly=False,
-                                               group_expand='_read_group_names',
                                                domain=[('category_id.equipment_type', '=', '机床')])
+    production_line_id = fields.Many2one('sf.production.line', string='生产线', readonly=True,
+                                         group_expand='_read_group_names')
     machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型', readonly=True,
                                             compute='_compute_machine_table_type_id')
     machine_tool_code = fields.Char(string='机台号', store=True, invisible=True, readonly=True)
@@ -461,14 +462,14 @@ class MachineTableToolChangingApply(models.Model):
     tool_position_interface_type = fields.Selection(
         [('BT刀柄式', 'BT刀柄式'), ('SK刀柄式', 'SK刀柄式'), ('HSK刀柄式', 'HSK刀柄式'),
          ('CAT刀柄式', 'CAT刀柄式'), ('ISO刀盘式', 'ISO刀盘式'), ('DIN刀盘式', 'DIN刀盘式'),
-         ('直装固定式', '直装固定式')], string='刀位接口型号')
+         ('直装固定式', '直装固定式')], string='刀位接口型号', requried=True)
     diameter = fields.Integer(string='刀具直径(mm)', requried=True)
     knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', requried=True)
     max_lifetime_value = fields.Integer(string='最大寿命值(min)', requried=True)
     alarm_value = fields.Integer(string='报警值(min)', requried=True)
     used_value = fields.Integer(string='已使用值(min)', requried=True)
     whether_standard_knife = fields.Boolean(string='是否标准刀', default=True)
-    extension__length = fields.Float(string='伸出长(mm)', requried=True)
+    extension_length = fields.Float(string='伸出长(mm)', requried=True)
     effective_length = fields.Float(string='有效长(mm)', requried=True)
 
     functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警')], string='功能刀具状态',
@@ -488,9 +489,11 @@ class MachineTableToolChangingApply(models.Model):
     def _compute_machine_table_type_id(self):
         for record in self:
             if record:
+                record.production_line_id = record.maintenance_equipment_id.production_line_id.id
                 record.machine_table_type_id = record.maintenance_equipment_id.category_id.id
                 record.machine_tool_code = record.maintenance_equipment_id.code
             else:
+                record.production_line_id = None
                 record.machine_table_type_id = None
                 record.machine_tool_code = None
 
@@ -505,8 +508,7 @@ class MachineTableToolChangingApply(models.Model):
 
     @api.model
     def _read_group_names(self, categories, domain, order):
-        names = categories._search([('category_id.equipment_type', '=', '机床')], order=order,
-                                   access_rights_uid=SUPERUSER_ID)
+        names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
         return categories.browse(names)
 
     @api.onchange('functional_tool_status')
@@ -686,13 +688,36 @@ class FunctionalToolAssembly(models.Model):
     _description = '功能刀具组装单'
     _order = 'use_tool_time asc'
 
-    assembly_order_code = fields.Char(string='编码', readonly=True)
-    barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
-    functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True)
-    functional_tool_name = fields.Char(string='功能刀具名称', requried=True)
     name = fields.Char(string='名称', readonly=True)
+    assembly_order_code = fields.Char(string='编码', readonly=True)
+
+    functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True)
+    functional_tool_name = fields.Char(string='功能刀具名称', readonly=True)
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
                                               group_expand='_read_group_functional_tool_type_ids')
+    functional_tool_diameter = fields.Integer(string='功能刀具直径(mm)', readonly=True)
+    knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True)
+    coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
+    new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
+    tool_loading_length = fields.Float(string='装刀长(mm)', readonly=True)
+    functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True)
+    effective_length = fields.Float(string='有效长(mm)', readonly=True)
+    loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装')],
+                                           string='装刀任务来源', readonly=True)
+    use_tool_time = fields.Datetime(string='用刀时间', readonly=True)
+    production_line_name_id = fields.Many2one('sf.production.line', string='申请产线', readonly=False)
+    machine_tool_name_id = fields.Many2one('maintenance.equipment', string='申请机台', readonly=True)
+    machine_tool_code = fields.Char(string='机台号', readonly=True)
+    applicant = fields.Char(string='申请人', readonly=True)
+    apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True)
+    assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装')], string='组装状态',
+                                       default='0', readonly=True)
+    cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True)
+    whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
+    reason_for_applying = fields.Char(string='申请原因', readonly=True)
+    max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True)
+    alarm_value = fields.Integer(string='报警值(min)', readonly=True)
+    used_value = fields.Integer(string='已使用值(min)', readonly=True)
 
     @api.model
     def _read_group_functional_tool_type_ids(self, categories, domain, order):
@@ -700,44 +725,36 @@ class FunctionalToolAssembly(models.Model):
         functional_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
         return categories.browse(functional_tool_type_ids)
 
-    functional_tool_diameter = fields.Char(string='功能刀具直径(mm)', readonly=True)
-    functional_tool_length = fields.Char(string='功能刀具伸出长(mm)', readonly=True)
-    functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
-
+    # 刀具物料信息
     # 整体式刀具型号
     integral_code_id = fields.Many2one('stock.lot', string='整体式刀具序列号', readonly=True)
     cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号',
                                                      readonly=True)
     integral_name = fields.Char('整体式刀具名称', readonly=True, compute='_compute_auto_fill')
     sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', string='整体式刀具品牌', readonly=True)
-
     # 刀片型号
     blade_code_id = fields.Many2one('stock.lot', '刀片序列号', readonly=True)
     cutting_tool_blade_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号', readonly=True)
     blade_name = fields.Char('刀片名称', readonly=True, compute='_compute_auto_fill')
     sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True)
-
     # 刀杆型号
     bar_code_id = fields.Many2one('stock.lot', '刀杆序列号', readonly=True)
     cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号',
                                                       readonly=True)
     bar_name = fields.Char('刀杆名称', readonly=True, compute='_compute_auto_fill')
     sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True)
-
     # 刀盘型号
     pad_code_id = fields.Many2one('stock.lot', '刀盘序列号', readonly=True)
     cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号',
                                                       readonly=True)
     pad_name = fields.Char('刀盘名称', readonly=True, compute='_compute_auto_fill')
     sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True)
-
     # 刀柄型号
     handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', readonly=True)
     cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号',
                                                          readonly=True)
     handle_name = fields.Char('刀柄名称', readonly=True, compute='_compute_auto_fill')
     sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True)
-
     # 夹头型号
     chuck_code_id = fields.Many2one('stock.lot', '夹头序列号', readonly=True)
     cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号',
@@ -798,28 +815,33 @@ class FunctionalToolAssembly(models.Model):
                 record.chuck_name = None
                 record.sf_tool_brand_id_6 = None
 
-    coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
-    tool_loading_length = fields.Char(string='装刀长(mm)', readonly=True)
-    new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
-    reference_length = fields.Char(string='参考伸出长(mm)', readonly=True)
+    # 组装功能刀具参数信息
+    barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
+    after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True)
+    after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
+                                                             string='组装后功能刀具类型', readonly=True,
+                                                             group_expand='_read_group_functional_tool_type_ids')
+    after_assembly_functional_tool_diameter = fields.Integer(string='功能刀具直径(mm)', readonly=True)
+    after_assembly_knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True)
+    after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
     cut_time = fields.Char(string='已切削时间', readonly=True)
     cut_length = fields.Char(string='已切削长度(mm)', readonly=True)
     cut_number = fields.Char(string='已切削次数', readonly=True)
 
-    loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装')],
-                                           string='装刀任务来源', readonly=True)
-    applicant = fields.Char(string='申请人', readonly=True)
-    reason_for_applying = fields.Char(string='申请原因', readonly=True)
-    apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True)
-    assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装')], string='组装状态',
-                                       default='0', readonly=True)
-    use_tool_time = fields.Datetime(string='用刀时间', readonly=True)
-    production_line_name_id = fields.Many2one('sf.production.line', string='产线名称', readonly=False)
-    machine_tool_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True)
-    machine_tool_code = fields.Char(string='机台号', readonly=True)
-    # cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
-    cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True)
+    after_assembly_whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
+    after_assembly_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
+                                                         string='粗/中/精', readonly=True)
+    after_assembly_max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True)
+    after_assembly_alarm_value = fields.Integer(string='报警值(min)', readonly=True)
+    after_assembly_used_value = fields.Integer(string='已使用值(min)', readonly=True)
+    after_assembly_tool_loading_length = fields.Float(string='装刀长(mm)', readonly=True)
+    after_assembly_functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True)
+    after_assembly_effective_length = fields.Float(string='有效长(mm)', readonly=True)
+    L_D_number = fields.Float(string='L/D值(mm)', readonly=True)
+    hiding_length = fields.Float(string='避空长(mm)', readonly=True)
 
+    functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
+    # cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
     tool_loading_person = fields.Char(string='装刀人', readonly=True)
     tool_loading_time = fields.Datetime(string='装刀时间', readonly=True)
     receive_person = fields.Char(string='领用人', readonly=True)
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index b9dd679b..217400b9 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
     <data>
-<!--========================================功能刀具列表========================================-->
+        <!--========================================功能刀具列表========================================-->
         <record id="view_functional_cutting_tool_list_tree" model="ir.ui.view">
             <field name="name">sf.functional.cutting.tool.entity.list.tree</field>
             <field name="model">sf.functional.cutting.tool.entity</field>
             <field name="arch" type="xml">
                 <tree string="功能刀具列表" create="0" edit="0" delete="0">
-                    <field name="barcode_id" />
-                    <field name="functional_tool_name_id" />
-                    <field name="mrs_cutting_tool_type_id" />
+                    <field name="barcode_id"/>
+                    <field name="functional_tool_name_id"/>
+                    <field name="mrs_cutting_tool_type_id"/>
                     <field name="cutting_tool_integral_model_id" optional="hide"/>
                     <field name="cutting_tool_blade_model_id" optional="hide"/>
                     <field name="cutting_tool_cutterbar_model_id" optional="hide"/>
@@ -25,20 +25,21 @@
             <field name="name">sf.functional.cutting.tool.entity.list.form</field>
             <field name="model">sf.functional.cutting.tool.entity</field>
             <field name="arch" type="xml">
-                <form create="0" edit="0" delete="0" >
+                <form create="0" edit="0" delete="0">
                     <sheet>
                         <div class="oe_button_box" name="button_box">
                             <button class="oe_stat_button"
-                                   name="open_functional_tool_warning"
-                                   icon="fa-list-ul"
-                                   type="object">
-                                   <div class="o_field_widget o_stat_info">
-                                        <span>
-                                            预警
-                                        </span>
-                                   </div>
+                                    name="open_functional_tool_warning"
+                                    icon="fa-list-ul"
+                                    type="object">
+                                <div class="o_field_widget o_stat_info">
+                                    <span>
+                                        预警
+                                    </span>
+                                </div>
                             </button>
-                            <button name="%(stock.action_stock_report)d" icon="fa-arrow-up" class="oe_stat_button" string="Traceability" type="action"/>
+                            <button name="%(stock.action_stock_report)d" icon="fa-arrow-up" class="oe_stat_button"
+                                    string="Traceability" type="action"/>
                         </div>
                         <div class="oe_title">
                             <h1>
@@ -47,7 +48,8 @@
                         </div>
                         <group>
                             <group>
-                                <field name="functional_tool_name_id" invisible="False" placeholder="请输入20字以内的名称"/>
+                                <field name="functional_tool_name_id" invisible="False"
+                                       placeholder="请输入20字以内的名称"/>
                                 <field name="mrs_cutting_tool_type_id"/>
                                 <field name="cutting_tool_integral_model_id"
                                        options="{'no_create': True, 'no_quick_create': True}"
@@ -69,50 +71,52 @@
                                        options="{'no_create': True, 'no_quick_create': True}"/>
                                 <field name="cutting_tool_cutterhead_model_id"
                                        options="{'no_create': True, 'no_quick_create': True}"/>
-<!--                                <field name="functional_cutting_tool_id"/>-->
-<!--                                <field name="cutting_tool_material" required="1" widget="radio"-->
-<!--                                           options="{'horizontal': true}"/>-->
-<!--                                <field name="mrs_cutting_tool_integral_model_ids"-->
-<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
-<!--                                       widget="many2many_tags"-->
-<!--                                       attrs="{'invisible': [('cutting_tool_material', '!=', '0')]}"-->
-<!--                                />-->
-<!--                                <field name="mrs_cutting_tool_blade_model_ids"-->
-<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
-<!--                                       widget="many2many_tags"-->
-<!--                                       attrs="{'invisible': [('cutting_tool_material', '!=', '1')]}"-->
-<!--                                />-->
-<!--                                <field name="mrs_cutting_tool_cutterbar_model_ids"-->
-<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
-<!--                                       widget="many2many_tags"-->
-<!--                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
-<!--                                />-->
-<!--                                <field name="mrs_cutting_tool_cutterpad_model_ids"-->
-<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
-<!--                                       widget="many2many_tags"-->
-<!--                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
-<!--                                />-->
-<!--                                <field name="mrs_cutting_tool_cutterhandle_model_ids"-->
-<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
-<!--                                       widget="many2many_tags"/>-->
-<!--                                <field name="mrs_cutting_tool_cutterhead_model_ids"-->
-<!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
-<!--                                       widget="many2many_tags"/>-->
+                                <!--                                <field name="functional_cutting_tool_id"/>-->
+                                <!--                                <field name="cutting_tool_material" required="1" widget="radio"-->
+                                <!--                                           options="{'horizontal': true}"/>-->
+                                <!--                                <field name="mrs_cutting_tool_integral_model_ids"-->
+                                <!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+                                <!--                                       widget="many2many_tags"-->
+                                <!--                                       attrs="{'invisible': [('cutting_tool_material', '!=', '0')]}"-->
+                                <!--                                />-->
+                                <!--                                <field name="mrs_cutting_tool_blade_model_ids"-->
+                                <!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+                                <!--                                       widget="many2many_tags"-->
+                                <!--                                       attrs="{'invisible': [('cutting_tool_material', '!=', '1')]}"-->
+                                <!--                                />-->
+                                <!--                                <field name="mrs_cutting_tool_cutterbar_model_ids"-->
+                                <!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+                                <!--                                       widget="many2many_tags"-->
+                                <!--                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterpad_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
+                                <!--                                />-->
+                                <!--                                <field name="mrs_cutting_tool_cutterpad_model_ids"-->
+                                <!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+                                <!--                                       widget="many2many_tags"-->
+                                <!--                                       attrs="{'invisible': ['|',('mrs_cutting_tool_cutterbar_model_ids','!=',[]),('cutting_tool_material', '!=', '1')]}"-->
+                                <!--                                />-->
+                                <!--                                <field name="mrs_cutting_tool_cutterhandle_model_ids"-->
+                                <!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+                                <!--                                       widget="many2many_tags"/>-->
+                                <!--                                <field name="mrs_cutting_tool_cutterhead_model_ids"-->
+                                <!--                                       options="{'no_create': True, 'no_quick_create': True}"-->
+                                <!--                                       widget="many2many_tags"/>-->
 
                             </group>
                             <group>
                                 <field name="image" nolabel="1" widget="image"/>
                             </group>
                         </group>
-<!--                        attrs="{'invisible': [('cutting_tool_blade_model_id', '!=', False)]}"-->
+                        <!--                        attrs="{'invisible': [('cutting_tool_blade_model_id', '!=', False)]}"-->
                         <group col="1">
                             <group string="适合加工方式">
-                                <field name="suitable_machining_method_ids" string="" widget="custom_many2many_checkboxes"
+                                <field name="suitable_machining_method_ids" string=""
+                                       widget="custom_many2many_checkboxes"
                                        domain="[('id','in',suitable_machining_method_ids)]"/>
                             </group>
                             <group>
                                 <group string="刀尖特征">
-                                    <field name="blade_tip_characteristics_id" string="" widget="custom_many2many_checkboxes"
+                                    <field name="blade_tip_characteristics_id" string=""
+                                           widget="custom_many2many_checkboxes"
                                            domain="[('id','in',blade_tip_characteristics_id)]"/>
                                 </group>
                                 <group string="柄部类型">
@@ -161,8 +165,8 @@
             <field name="model">sf.functional.cutting.tool.entity</field>
             <field name="arch" type="xml">
                 <search>
-                    <field name="barcode_id" />
-                    <field name="functional_tool_name_id" />
+                    <field name="barcode_id"/>
+                    <field name="functional_tool_name_id"/>
                     <field name="mrs_cutting_tool_type_id"/>
                     <field name="cutting_tool_integral_model_id" optional="hide"/>
                     <field name="cutting_tool_blade_model_id" optional="hide"/>
@@ -177,7 +181,7 @@
             </field>
         </record>
 
-         <record id="sf_function_tool_entry_list_view_act" model="ir.actions.act_window">
+        <record id="sf_function_tool_entry_list_view_act" model="ir.actions.act_window">
             <field name="name">功能刀具列表</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.functional.cutting.tool.entity</field>
@@ -185,13 +189,13 @@
             <field name="view_id" ref="view_functional_cutting_tool_list_tree"/>
         </record>
 
-<!--  ======================================== 功能刀具预警========================================-->
+        <!--  ======================================== 功能刀具预警========================================-->
         <record id="view_sf_functional_tool_warning_tree" model="ir.ui.view">
             <field name="name">sf.functional.tool.warning.tree</field>
             <field name="model">sf.functional.tool.warning</field>
             <field name="arch" type="xml">
-                <tree string="功能刀具预警" create="0" edit="0" delete="0" >
-                    <field name="barcode_id" />
+                <tree string="功能刀具预警" create="0" edit="0" delete="0">
+                    <field name="barcode_id"/>
                     <field name="functional_tool_name_id"/>
                     <field name="mrs_cutting_tool_type_id"/>
                     <field name="cutting_tool_integral_model_id" optional="hide"/>
@@ -217,7 +221,7 @@
             <field name="name">sf.functional.tool.warning.form</field>
             <field name="model">sf.functional.tool.warning</field>
             <field name="arch" type="xml">
-                <form string="功能刀具预警" create="0" edit="0" delete="0" >
+                <form string="功能刀具预警" create="0" edit="0" delete="0">
                     <sheet>
                         <div class="oe_title">
                             <h1>
@@ -311,9 +315,9 @@
             <field name="model">sf.functional.tool.warning</field>
             <field name="arch" type="xml">
                 <search string="功能刀具预警">
-                    <field name="barcode_id" />
-                    <field name="functional_tool_name_id" />
-                    <field name="mrs_cutting_tool_type_id" />
+                    <field name="barcode_id"/>
+                    <field name="functional_tool_name_id"/>
+                    <field name="mrs_cutting_tool_type_id"/>
                     <field name="cutting_tool_integral_model_id" optional="hide"/>
                     <field name="cutting_tool_blade_model_id" optional="hide"/>
                     <field name="cutting_tool_cutterbar_model_id" optional="hide"/>
@@ -330,7 +334,8 @@
                     <field name="dispose_func" optional="show"/>
                     <field name="remark" optional="show"/>
                     <searchpanel>
-                        <field name="machine_table_name_id" string="CNC机床列表" icon="fa-building" enable_counters="1"/>
+                        <field name="machine_table_name_id" string="CNC机床列表" icon="fa-building"
+                               enable_counters="1"/>
                     </searchpanel>
                 </search>
             </field>
@@ -344,12 +349,12 @@
         </record>
 
 
-<!--  =====================================功能刀具实时分布=============================================================      -->
+        <!--  =====================================功能刀具实时分布=============================================================      -->
         <record id="sf_real_time_distribution_of_functional_tools_view_tree" model="ir.ui.view">
             <field name="name">功能刀具实时分布</field>
             <field name="model">sf.real.time.distribution.of.functional.tools</field>
             <field name="arch" type="xml">
-                <tree create="0" edit="0" delete="0" >
+                <tree create="0" edit="0" delete="0">
                     <field name="barcode_id"/>
                     <field name="functional_tool_name_id"/>
                     <field name="mrs_cutting_tool_type_id"/>
@@ -378,7 +383,7 @@
             <field name="name">功能刀具实时分布</field>
             <field name="model">sf.real.time.distribution.of.functional.tools</field>
             <field name="arch" type="xml">
-                <form create="0" edit="0" delete="0" >
+                <form create="0" edit="0" delete="0">
                     <sheet>
                         <div class="oe_title">
                             <h1>
@@ -500,7 +505,7 @@
         </record>
 
 
-<!--  ========================================功能刀具出入库记录==================================================================      -->
+        <!--  ========================================功能刀具出入库记录==================================================================      -->
 
         <record id="sf_inbound_and_outbound_records_of_functional_tools_view_tree" model="ir.ui.view">
             <field name="name">功能刀具出入库记录</field>
@@ -519,7 +524,7 @@
                     <field name="current_state"/>
                     <field name="current_store_area"/>
                     <field name="current_store_place"/>
-<!--                    <field name="applicant"/>-->
+                    <!--                    <field name="applicant"/>-->
                 </tree>
             </field>
         </record>
@@ -601,7 +606,7 @@
                                     <group>
                                         <field name="current_state"/>
                                         <field name="thickness"/>
-<!--                                        <field name="max_life_span"/>-->
+                                        <!--                                        <field name="max_life_span"/>-->
                                         <field name="used_value"/>
                                         <field name="tool_install_time"/>
                                         <field name="reason_application"/>
@@ -631,7 +636,7 @@
                     <field name="current_state"/>
                     <field name="current_store_area"/>
                     <field name="current_store_place"/>
-<!--                    <field name="applicant"/>-->
+                    <!--                    <field name="applicant"/>-->
                     <searchpanel>
                         <field name="mrs_cutting_tool_type_id" enable_counters="1" icon="fa-building"/>
                     </searchpanel>
@@ -647,7 +652,7 @@
         </record>
 
 
-<!--================================================出入库记录================================================-->
+        <!--================================================出入库记录================================================-->
         <record id="sf_inbound_and_outbound_records_view_tree" model="ir.ui.view">
             <field name="name">出入库记录</field>
             <field name="model">sf.inbound.and.outbound.records</field>
@@ -701,18 +706,17 @@
         </record>
 
 
-<!--================================================机床换刀申请================================================-->
+        <!--================================================机床换刀申请================================================-->
         <record id="sf_machine_table_tool_changing_apply_tree" model="ir.ui.view">
             <field name="name">机床换刀申请</field>
             <field name="model">sf.machine.table.tool.changing.apply</field>
             <field name="arch" type="xml">
                 <tree>
                     <field name="name" invisible="1"/>
+                    <field name="production_line_id" invisible="1"/>
                     <field name="maintenance_equipment_id"/>
                     <field name="machine_tool_code"/>
-                    <field name="machine_table_type_id"/>
-                    <field name="cutter_spacing_code_id" optional="hide"/>
-                    <field name="barcode_id" invisible="1"/>
+                    <field name="cutter_spacing_code_id"/>
                     <field name="functional_tool_name"/>
                     <field name="diameter"/>
                     <field name="knife_tip_r_angle"/>
@@ -722,18 +726,21 @@
                     <field name="functional_tool_status" string="状态"/>
                     <field name="applicant" optional="hide"/>
 
+                    <field name="machine_table_type_id" invisible="1"/>
+                    <field name="barcode_id" invisible="1"/>
                     <field name="functional_tool_type_id" invisible="1"/>
                     <field name="tool_position_interface_type" invisible="1"/>
-                    <field name="extension__length" invisible="1"/>
+                    <field name="extension_length" invisible="1"/>
                     <field name="effective_length" invisible="1"/>
                     <field name="functional_tool_name_id" invisible="1"/>
                     <field name="whether_standard_knife" invisible="1"/>
                     <field name="functional_tool_name" invisible="1"/>
                     <field name="status" invisible="1"/>
                     <button string="换刀申请"
-                                name="%(sf_tool_management.sf_tool_change_requirement_information_act)d"
-                                type="action"
-                                context="{  'default_name':name,
+                            name="%(sf_tool_management.sf_tool_change_requirement_information_act)d"
+                            type="action"
+                            context="{  'default_name':name,
+                                        'default_production_line_id': production_line_id,
                                         'default_maintenance_equipment_id': maintenance_equipment_id,
                                         'default_machine_table_type_id': machine_table_type_id,
                                         'default_machine_tool_code': machine_tool_code,
@@ -749,21 +756,53 @@
                                         'default_alarm_value': alarm_value,
                                         'default_used_value': used_value,
                                         'default_whether_standard_knife': whether_standard_knife,
-                                        'default_extension__length': extension__length,
+                                        'default_extension_length': extension_length,
+                                        'default_effective_length': effective_length,
+
+                                        'default_replacement_tool_name': functional_tool_name,
+                                        'default_replacement_tool_type_id': functional_tool_type_id,
+                                        'default_replacement_diameter': diameter,
+                                        'default_replacement_knife_tip_r_angle': knife_tip_r_angle,
+                                        'default_replacement_max_lifetime_value': max_lifetime_value,
+                                        'default_replacement_alarm_value': alarm_value,
+                                        'default_replacement_used_value': used_value,
+                                        'default_replacement_whether_standard_knife': whether_standard_knife,
+                                        'default_replacement_extension_length': extension_length,
+                                        'default_replacement_effective_length': effective_length,
+                                        }"
+                            attrs="{'invisible': [('status', '!=', '0')]}"
+                            class="btn-primary"
+                    />
+                    <button string="转移"
+                            name="%(sf_tool_management.sf_tool_transfer_request_information_act)d"
+                            type="action"
+                            context="{ 'default_name':name,
+                                        'default_production_line_id': production_line_id,
+                                        'default_maintenance_equipment_id': maintenance_equipment_id,
+                                        'default_machine_table_type_id': machine_table_type_id,
+                                        'default_machine_tool_code': machine_tool_code,
+                                        'default_cutter_spacing_code_id': cutter_spacing_code_id,
+                                        'default_barcode_id': barcode_id,
+                                        'default_functional_tool_name': functional_tool_name,
+                                        'default_functional_tool_name_id': functional_tool_name_id,
+                                        'default_functional_tool_type_id': functional_tool_type_id,
+                                        'default_tool_position_interface_type': tool_position_interface_type,
+                                        'default_diameter': diameter,
+                                        'default_knife_tip_r_angle': knife_tip_r_angle,
+                                        'default_max_lifetime_value': max_lifetime_value,
+                                        'default_alarm_value': alarm_value,
+                                        'default_used_value': used_value,
+                                        'default_whether_standard_knife': whether_standard_knife,
+                                        'default_extension_length': extension_length,
                                         'default_effective_length': effective_length,
                                         }"
-                                attrs="{'invisible': [('status', '!=', '0')]}"
-                                class="btn-primary"
-                        />
-                        <button string="转移"
-                                name="%(sf_tool_management.sf_tool_transfer_request_information_act)d"
-                                type="action"
-                                context="{}"
-                                class="btn-primary"
-                                attrs="{'invisible': [('status', '!=', '0')]}"
-                        />
-                       <button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}" confirm="是否确认撤回换刀申请"/>
-                        <button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
+                            class="btn-primary"
+                            attrs="{'invisible': [('status', '!=', '0')]}"
+                    />
+                    <button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary"
+                            attrs="{'invisible': [('status', '!=', '1')]}" confirm="是否确认撤回换刀申请"/>
+                    <button string="撤回转移" name="revocation_2" type="object" class="btn-primary"
+                            attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
                 </tree>
             </field>
         </record>
@@ -773,11 +812,12 @@
             <field name="model">sf.machine.table.tool.changing.apply</field>
             <field name="arch" type="xml">
                 <form string="机床换刀申请">
-                     <header>
+                    <header>
                         <button string="换刀申请"
                                 name="%(sf_tool_management.sf_tool_change_requirement_information_act)d"
                                 type="action"
                                 context="{  'default_name':name,
+                                        'default_production_line_id': production_line_id,
                                         'default_maintenance_equipment_id': maintenance_equipment_id,
                                         'default_machine_table_type_id': machine_table_type_id,
                                         'default_machine_tool_code': machine_tool_code,
@@ -793,8 +833,19 @@
                                         'default_alarm_value': alarm_value,
                                         'default_used_value': used_value,
                                         'default_whether_standard_knife': whether_standard_knife,
-                                        'default_extension__length': extension__length,
+                                        'default_extension_length': extension_length,
                                         'default_effective_length': effective_length,
+
+                                        'default_replacement_tool_name': functional_tool_name,
+                                        'default_replacement_tool_type_id': functional_tool_type_id,
+                                        'default_replacement_diameter': diameter,
+                                        'default_replacement_knife_tip_r_angle': knife_tip_r_angle,
+                                        'default_replacement_max_lifetime_value': max_lifetime_value,
+                                        'default_replacement_alarm_value': alarm_value,
+                                        'default_replacement_used_value': used_value,
+                                        'default_replacement_whether_standard_knife': whether_standard_knife,
+                                        'default_replacement_extension_length': extension_length,
+                                        'default_replacement_effective_length': effective_length,
                                         }"
                                 attrs="{'invisible': [('status', '!=', '0')]}"
                                 class="btn-primary"
@@ -802,12 +853,33 @@
                         <button string="转移"
                                 name="%(sf_tool_management.sf_tool_transfer_request_information_act)d"
                                 type="action"
-                                context="{}"
+                                context="{ 'default_name':name,
+                                        'default_production_line_id': production_line_id,
+                                        'default_maintenance_equipment_id': maintenance_equipment_id,
+                                        'default_machine_table_type_id': machine_table_type_id,
+                                        'default_machine_tool_code': machine_tool_code,
+                                        'default_cutter_spacing_code_id': cutter_spacing_code_id,
+                                        'default_barcode_id': barcode_id,
+                                        'default_functional_tool_name': functional_tool_name,
+                                        'default_functional_tool_name_id': functional_tool_name_id,
+                                        'default_functional_tool_type_id': functional_tool_type_id,
+                                        'default_tool_position_interface_type': tool_position_interface_type,
+                                        'default_diameter': diameter,
+                                        'default_knife_tip_r_angle': knife_tip_r_angle,
+                                        'default_max_lifetime_value': max_lifetime_value,
+                                        'default_alarm_value': alarm_value,
+                                        'default_used_value': used_value,
+                                        'default_whether_standard_knife': whether_standard_knife,
+                                        'default_extension_length': extension_length,
+                                        'default_effective_length': effective_length,
+                                        }"
                                 class="btn-primary"
                                 attrs="{'invisible': [('status', '!=', '0')]}"/>
-                         <button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}" confirm="是否确认撤回换刀申请"/>
-                         <button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
-                     </header>
+                        <button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary"
+                                attrs="{'invisible': [('status', '!=', '1')]}" confirm="是否确认撤回换刀申请"/>
+                        <button string="撤回转移" name="revocation_2" type="object" class="btn-primary"
+                                attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
+                    </header>
                     <sheet>
                         <div class="oe_title">
                             <h1>
@@ -816,9 +888,10 @@
                         </div>
                         <group>
                             <group>
+                                <field name="production_line_id"/>
                                 <field name="machine_table_type_id"/>
                                 <field name="cutter_spacing_code_id"/>
-                                <field name="tool_position_interface_type"/>
+                                <field name="tool_position_interface_type" placeholder="请选择"/>
                                 <field name="sf_functional_tool_assembly_id" string="组装单"/>
                             </group>
                         </group>
@@ -841,7 +914,7 @@
                                         <field name="max_lifetime_value"/>
                                         <field name="alarm_value"/>
                                         <field name="used_value"/>
-                                        <field name="extension__length"/>
+                                        <field name="extension_length"/>
                                         <field name="effective_length"/>
                                         <field name="whether_standard_knife"/>
                                     </group>
@@ -853,11 +926,12 @@
             </field>
         </record>
 
-        <record id="sf_machine_table_tool_changing_apply_search" model="ir.ui.view" >
+        <record id="sf_machine_table_tool_changing_apply_search" model="ir.ui.view">
             <field name="model">sf.machine.table.tool.changing.apply</field>
             <field name="arch" type="xml">
                 <search>
                     <field name="name" invisible="1"/>
+                    <field name="production_line_id" invisible="1"/>
                     <field name="maintenance_equipment_id"/>
                     <field name="machine_tool_code"/>
                     <field name="machine_table_type_id"/>
@@ -872,7 +946,8 @@
                     <field name="functional_tool_status"/>
                     <field name="applicant" optional="hide"/>
                     <searchpanel>
-                        <field name="maintenance_equipment_id" enable_counters="1" icon="fa-building"/>
+                        <field name="production_line_id" enable_counters="1" icon="fa-building"/>
+                        <field name="functional_tool_status" enable_counters="1" icon="fa-building"/>
                     </searchpanel>
                 </search>
             </field>
@@ -887,7 +962,7 @@
         </record>
 
 
-<!--================================================CAM工单程序用刀计划================================================-->
+        <!--================================================CAM工单程序用刀计划================================================-->
         <record id="sf_CAM_work_order_program_knife_plan_tree" model="ir.ui.view">
             <field name="name">CAM工单程序用刀计划</field>
             <field name="model">sf.cam.work.order.program.knife.plan</field>
@@ -903,8 +978,10 @@
                     <field name="applicant"/>
                     <field name="remark" optional="hide"/>
                     <field name="plan_execute_status" invisible="True"/>
-                    <button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
-                    <button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
+                    <button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary"
+                            attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
+                    <button string="撤回" name="revocation" type="object" class="btn-primary"
+                            attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
                 </tree>
             </field>
         </record>
@@ -915,8 +992,10 @@
             <field name="arch" type="xml">
                 <form>
                     <header>
-                        <button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
-                        <button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
+                        <button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary"
+                                attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
+                        <button string="撤回" name="revocation" type="object" class="btn-primary"
+                                attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
                         <field name="plan_execute_status" widget="statusbar" statusbar_visible="0,1,2"/>
                     </header>
 
@@ -973,7 +1052,7 @@
             </field>
         </record>
 
-        <record id="sf_cam_work_order_program_knife_plan_search" model="ir.ui.view" >
+        <record id="sf_cam_work_order_program_knife_plan_search" model="ir.ui.view">
             <field name="model">sf.cam.work.order.program.knife.plan</field>
             <field name="arch" type="xml">
                 <search>
@@ -1000,7 +1079,7 @@
         </record>
 
 
-<!--================================================功能刀具组装================================================-->
+        <!--================================================功能刀具组装================================================-->
         <record id="sf_functional_tool_assembly_tree" model="ir.ui.view">
             <field name="name">功能刀具组装</field>
             <field name="model">sf.functional.tool.assembly</field>
@@ -1008,17 +1087,32 @@
                 <tree create="0">
                     <field name="assembly_order_code"/>
                     <field name="barcode_id" optional="hide"/>
-<!--                    <field name="functional_tool_code" invisible="1"/>-->
-                    <field name="functional_tool_name_id"/>
-                    <field name="functional_tool_type_id"/>
-                    <field name="loading_task_source"/>
+                    <field name="functional_tool_name"/>
+                    <field name="functional_tool_diameter" string="刀具直径"/>
+                    <field name="knife_tip_r_angle"/>
+                    <field name="coarse_middle_thin" optional="hide"/>
+                    <field name="new_former" optional="hide"/>
+                    <field name="tool_loading_length" optional="hide"/>
+                    <field name="functional_tool_length" optional="hide"/>
+                    <field name="effective_length" optional="hide"/>
+                    <field name="loading_task_source" string="任务来源"/>
+                    <field name="use_tool_time"/>
+                    <field name="production_line_name_id"/>
+                    <field name="machine_tool_name_id"/>
                     <field name="applicant"/>
+                    <field name="apply_time"/>
                     <field name="assemble_status" optional="hide"/>
-                    <field name="use_tool_time" />
-                    <field name="receive_person"/>
-                    <field name="receive_time"/>
-                    <field name="remark" optional="hide"/>
 
+                    <field name="machine_tool_code" invisible="True"/>
+                    <field name="cutter_spacing_code_id" invisible="True"/>
+                    <field name="whether_standard_knife" invisible="True"/>
+                    <field name="reason_for_applying" invisible="True"/>
+
+                    <field name="receive_person" invisible="True"/>
+                    <field name="receive_time" invisible="True"/>
+                    <field name="remark" invisible="True"/>
+                    <field name="functional_tool_name_id" invisible="True"/>
+                    <field name="functional_tool_type_id" invisible="True"/>
                     <field name="machine_tool_name_id" invisible="True"/>
                     <field name="machine_tool_code" invisible="True"/>
                     <field name="cutter_spacing_code_id" invisible="True"/>
@@ -1027,26 +1121,14 @@
                     <field name="functional_tool_cutting_type" invisible="True"/>
 
                     <button string="组装"
-                               name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
-                               type="action"
-                               context="{
-                                    'default_machine_tool_name_id': machine_tool_name_id,
-                                    'default_machine_tool_code': machine_tool_code,
-                                    'default_barcode_id': barcode_id,
-                                    'default_cutter_spacing_code_id': cutter_spacing_code_id,
-                                    'default_functional_tool_name_id': functional_tool_name_id,
-                                    'default_functional_tool_type_id': functional_tool_type_id,
-                                    'default_functional_tool_length': functional_tool_length,
-                                    'default_effective_length': None,
-                                    'default_functional_tool_diameter': functional_tool_diameter,
-                                    'default_tool_included_angle': None,
-                                    'default_functional_tool_cutting_type': functional_tool_cutting_type,
-                                    'default_required_cutting_time': None,
-                                    'default_whether_standard_tool': None}"
-                               attrs="{'invisible': [('assemble_status', '!=', '0')]}"
-                               class="btn-primary"/>
+                            name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
+                            type="action"
+                            context="{}"
+                            attrs="{'invisible': [('assemble_status', '!=', '0')]}"
+                            class="btn-primary"/>
                     <button string="组装单打印" name="assemble_single_print" type="object"
-                            attrs="{'invisible': [('assemble_status', '=', '0')]}"  class="btn-primary" confirm="是否确认打印组装单"/>
+                            attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"
+                            confirm="是否确认打印组装单"/>
                 </tree>
             </field>
         </record>
@@ -1058,30 +1140,19 @@
                 <form create="0">
                     <header>
                         <button string="组装"
-                               name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
-                               type="action"
-                               context="{
-                                    'default_machine_tool_name_id': machine_tool_name_id,
-                                    'default_machine_tool_code': machine_tool_code,
-                                    'default_barcode_id': barcode_id,
-                                    'default_cutter_spacing_code_id': cutter_spacing_code_id,
-                                    'default_functional_tool_name_id': functional_tool_name_id,
-                                    'default_functional_tool_type_id': functional_tool_type_id,
-                                    'default_functional_tool_length': functional_tool_length,
-                                    'default_effective_length': None,
-                                    'default_functional_tool_diameter': functional_tool_diameter,
-                                    'default_tool_included_angle': None,
-                                    'default_functional_tool_cutting_type': functional_tool_cutting_type,
-                                    'default_required_cutting_time': None,
-                                    'default_whether_standard_tool': None}"
-                               attrs="{'invisible': [('assemble_status', '!=', '0')]}"
-                               class="btn-primary"/>
+                                name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
+                                type="action"
+                                context="{}"
+                                attrs="{'invisible': [('assemble_status', '!=', '0')]}"
+                                class="btn-primary"/>
 
                         <button string="打印二维码" name="automatic_printing_of_QR_code" type="object"
-                               attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印二维码"/>
+                                attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"
+                                confirm="是否确认打印二维码"/>
                         <button string="组装单打印" name="assemble_single_print" type="object"
-                                attrs="{'invisible': [('assemble_status', '=', '0')]}"  class="btn-primary" confirm="是否确认打印组装单"/>
-                         <field name="assemble_status" widget="statusbar" statusbar_visible="0,1,2"/>
+                                attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"
+                                confirm="是否确认打印组装单"/>
+                        <field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/>
                     </header>
                     <sheet>
                         <div class="oe_title">
@@ -1091,45 +1162,39 @@
                         </div>
                         <group>
                             <group>
-                                <field name="barcode_id"/>
-                                <field name="functional_tool_name_id"/>
-                                <field name="functional_tool_type_id"/>
+                                <field name="production_line_name_id"/>
+                                <field name="machine_tool_name_id"/>
+                                <field name="cutter_spacing_code_id"/>
                                 <field name="sf_machine_table_tool_changing_apply_id"
                                        attrs="{'invisible': [('sf_machine_table_tool_changing_apply_id','=',False)]}"/>
                                 <field name="sf_cam_work_order_program_knife_plan_id"
                                        attrs="{'invisible': [('sf_cam_work_order_program_knife_plan_id','=',False)]}"/>
-                           </group>
-                            <group>
-                                <field name="functional_tool_diameter"/>
-                                <field name="functional_tool_length"/>
-                                <field name="functional_tool_cutting_type"/>
                             </group>
-                       </group>
-
+                        </group>
                         <notebook>
-                            <page string="组装信息">
+                            <page string="组装信息" attrs="{'invisible': [('assemble_status', '=' ,'0')]}">
                                 <group col="1">
                                     <group col="1">
+                                        <group>
                                             <group>
-                                                <group>
-                                                    <field name="coarse_middle_thin"/>
-                                                    <field name="new_former"/>
-                                                    <field name="tool_loading_length"/>
-                                                    <field name="reference_length"/>
-                                                </group>
-                                                <group>
-                                                    <field name="cut_time"/>
-                                                    <field name="cut_length"/>
-                                                    <field name="cut_number"/>
-                                                </group>
+                                                <field name="coarse_middle_thin"/>
+                                                <field name="new_former"/>
+                                                <field name="tool_loading_length"/>
+                                                <field name="reference_length"/>
                                             </group>
+                                            <group>
+                                                <field name="cut_time"/>
+                                                <field name="cut_length"/>
+                                                <field name="cut_number"/>
+                                            </group>
+                                        </group>
                                     </group>
                                 </group>
                                 <group>
                                     <group col="1">
                                         <group col="1" attrs="{'invisible': [('handle_code_id', '=', False)]}">
                                             <div>
-                                               <separator string="刀柄:" style="font-size: 13px;"/>
+                                                <separator string="刀柄:" style="font-size: 13px;"/>
                                             </div>
                                             <group>
                                                 <field name="handle_code_id" string="序列号" placeholder="请选择"
@@ -1141,7 +1206,7 @@
                                         </group>
                                         <group col="1" attrs="{'invisible': [('integral_code_id', '=', False)]}">
                                             <div>
-                                               <separator string="整体式刀具:" style="font-size: 13px;"/>
+                                                <separator string="整体式刀具:" style="font-size: 13px;"/>
                                             </div>
                                             <group>
                                                 <field name="integral_code_id" placeholder="请选择" string="序列号"
@@ -1153,7 +1218,7 @@
                                         </group>
                                         <group col="1" attrs="{'invisible': [('blade_code_id', '=', False)]}">
                                             <div>
-                                               <separator string="刀片:" style="font-size: 13px;"/>
+                                                <separator string="刀片:" style="font-size: 13px;"/>
                                             </div>
                                             <group>
                                                 <field name="blade_code_id" placeholder="请选择" string="序列号"
@@ -1167,7 +1232,7 @@
                                     <group col="1">
                                         <group col="1" attrs="{'invisible': [('chuck_code_id', '=', False)]}">
                                             <div>
-                                               <separator string="夹头:" style="font-size: 13px;"/>
+                                                <separator string="夹头:" style="font-size: 13px;"/>
                                             </div>
                                             <group>
                                                 <group>
@@ -1181,7 +1246,7 @@
                                         </group>
                                         <group col="1" attrs="{'invisible': [('bar_code_id', '=', False)]}">
                                             <div>
-                                               <separator string="刀杆:" style="font-size: 13px;"/>
+                                                <separator string="刀杆:" style="font-size: 13px;"/>
                                             </div>
                                             <group>
                                                 <group>
@@ -1195,7 +1260,7 @@
                                         </group>
                                         <group col="1" attrs="{'invisible': [('pad_code_id', '=', False)]}">
                                             <div>
-                                               <separator string="刀盘:" style="font-size: 13px;"/>
+                                                <separator string="刀盘:" style="font-size: 13px;"/>
                                             </div>
                                             <group>
                                                 <group>
@@ -1208,24 +1273,27 @@
                                             </group>
                                         </group>
                                     </group>
-                               </group>
+                                </group>
                             </page>
                             <page string="申请信息">
                                 <group>
-                                   <group>
-                                       <field name="production_line_name_id"/>
-                                       <field name="machine_tool_name_id"/>
-                                       <field name="machine_tool_code"/>
-                                       <field name="cutter_spacing_code_id"/>
-                                       <field name="applicant"/>
-                                   </group>
-                                   <group>
-                                       <field name="loading_task_source"/>
-                                       <field name="use_tool_time"/>
-                                       <field name="apply_time"/>
-                                       <field name="reason_for_applying"/>
-                                   </group>
-                               </group>
+                                    <group>
+                                        <field name="functional_tool_name"/>
+                                        <field name="functional_tool_type_id"/>
+                                        <field name="functional_tool_diameter" string="刀具直径(mm)"/>
+                                        <field name="knife_tip_r_angle"/>
+                                        <field name="tool_loading_length"/>
+                                        <field name="functional_tool_length"/>
+                                        <field name="effective_length"/>
+                                    </group>
+                                    <group>
+                                        <field name="whether_standard_knife"/>
+                                        <field name="coarse_middle_thin"/>
+                                        <field name="new_former"/>
+                                        <field name="use_tool_time"/>
+                                        <field name="reason_for_applying"/>、
+                                    </group>
+                                </group>
                             </page>
                             <page string="装刀信息">
                                 <group>
@@ -1253,24 +1321,31 @@
             </field>
         </record>
 
-        <record id="sf_functional_tool_assembly_search" model="ir.ui.view" >
+        <record id="sf_functional_tool_assembly_search" model="ir.ui.view">
             <field name="model">sf.functional.tool.assembly</field>
             <field name="arch" type="xml">
                 <search>
-<!--                    <field name="functional_tool_code"/>-->
-                    <field name="functional_tool_name_id"/>
                     <field name="assembly_order_code"/>
-                    <field name="barcode_id"/>
-                    <field name="functional_tool_type_id"/>
-                    <field name="loading_task_source"/>
-                    <field name="applicant"/>
-                    <field name="assemble_status"/>
+                    <field name="barcode_id" optional="hide"/>
+                    <field name="functional_tool_name"/>
+                    <field name="functional_tool_diameter"/>
+                    <field name="knife_tip_r_angle"/>
+                    <field name="coarse_middle_thin"/>
+                    <field name="new_former"/>
+                    <field name="tool_loading_length"/>
+                    <field name="functional_tool_length"/>
+                    <field name="effective_length"/>
+                    <field name="loading_task_source" string="任务来源"/>
                     <field name="use_tool_time"/>
-                    <field name="receive_person"/>
-                    <field name="receive_time"/>
-                    <field name="remark"/>
+                    <field name="production_line_name_id"/>
+                    <field name="machine_tool_name_id"/>
+                    <field name="applicant"/>
+                    <field name="apply_time"/>
+                    <field name="functional_tool_type_id"/>
+                    <field name="assemble_status"/>
                     <searchpanel>
                         <field name="functional_tool_type_id" enable_counters="1" icon="fa-filter"/>
+                        <field name="assemble_status" enable_counters="1" icon="fa-filter"/>
                     </searchpanel>
                 </search>
             </field>
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 3e55ad8b..053ba39a 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -1,3 +1,5 @@
+from datetime import timedelta
+
 from odoo import fields, models, api
 from odoo.exceptions import ValidationError
 
@@ -8,6 +10,7 @@ class ToolChangeRequirementInformation(models.TransientModel):
 
     name = fields.Char('名称', related='maintenance_equipment_id.name', store=True, readonly=True)
     maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True)
+    production_line_id = fields.Many2one('sf.production.line', string='生产线', readonly=True)
     machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型', readonly=True)
     machine_tool_code = fields.Char(string='机台号', store=True, invisible=True, readonly=True)
     cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True)
@@ -25,7 +28,7 @@ class ToolChangeRequirementInformation(models.TransientModel):
     alarm_value = fields.Integer(string='报警值(min)', readonly=True)
     used_value = fields.Integer(string='已使用值(min)', readonly=True)
     whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
-    extension__length = fields.Float(string='伸出长(mm)', readonly=True)
+    extension_length = fields.Float(string='伸出长(mm)', readonly=True)
     effective_length = fields.Float(string='有效长(mm)', readonly=True)
 
     # 待换功能刀具信息
@@ -34,17 +37,18 @@ class ToolChangeRequirementInformation(models.TransientModel):
     replacement_diameter = fields.Integer(string='待换刀具直径(mm)', requried=True)
     replacement_knife_tip_r_angle = fields.Float(string='待换刀具刀尖R角(mm)', requried=True)
     replacement_tool_setting_length = fields.Float(string='待换刀具装刀长(mm)', requried=True)
-    replacement_extension__length = fields.Float(string='待换刀具伸出长(mm)', requried=True)
+    replacement_extension_length = fields.Float(string='待换刀具伸出长(mm)', requried=True)
     replacement_effective_length = fields.Float(string='待换刀具有效长(mm)', requried=True)
     replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
-                                                           string='待换刀具粗/中/精')
+                                                           string='待换刀具粗/中/精', default='3')
 
     replacement_max_lifetime_value = fields.Integer(string='待换刀具最大寿命值(min)', requried=True)
     replacement_alarm_value = fields.Integer(string='待换刀具报警值(min)', requried=True)
     replacement_used_value = fields.Integer(string='待换刀具已使用值(min)', requried=True)
-    new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧')
+    new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', default='0')
     replacement_whether_standard_knife = fields.Boolean(string='待换刀具是否标准刀', default=True, requried=True)
-    used_tool_time = fields.Datetime(string='用刀时间')
+    used_tool_time = fields.Datetime(string='用刀时间',
+                                     default=lambda self: fields.Datetime.now() + timedelta(hours=4))
     applicant = fields.Char(string='申请人', default=lambda self: self.env.user.name, readonly=True)
     reason_for_applying = fields.Char(string='申请原因')
 
@@ -53,30 +57,40 @@ class ToolChangeRequirementInformation(models.TransientModel):
         确认换刀申请（按键）
         :return:
         """
-        # 将数据更新到机台换刀申请界面
         print('已运行')
         record = self.env['sf.machine.table.tool.changing.apply'].search(
             [('maintenance_equipment_id', '=', self.maintenance_equipment_id.id),
              ('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id)
              ])
         print('运行record_1')
-        # 功能刀具组装创建新任务(new_assembly_task)
-        # todo
-        # record_1 = self.env['sf.functional.tool.assembly'].sudo().create({
-        #     'functional_tool_name_id': self.replacement_tool_name_id.id,
-        #     'functional_tool_type_id': self.replacement_tool_type_id.id,
-        #     'loading_task_source': '1',
-        #     'applicant': self.applicant,
-        #     'reason_for_applying': self.reason_for_applying,
-        #     'use_tool_time': self.used_tool_time,
-        #     'machine_tool_name_id': self.name.id,
-        #     'machine_tool_code': self.machine_tool_code,
-        #     'cutter_spacing_code': self.cutter_spacing_code,
-        #     'sf_machine_table_tool_changing_apply_id': record.id,
-        # })
-        # print('record_1:', record_1)
 
-        # record.write(desc)
+        # 功能刀具组装创建新任务(new_assembly_task)
+        sf_functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().create({
+            'functional_tool_name': self.replacement_tool_name,
+            'functional_tool_type_id': self.replacement_tool_type_id.id,
+            'functional_tool_diameter': self.replacement_diameter,
+            'knife_tip_r_angle': self.replacement_knife_tip_r_angle,
+            'coarse_middle_thin': self.replacement_tool_coarse_middle_thin,
+            'new_former': self.new_former,
+            'tool_loading_length': self.replacement_tool_setting_length,
+            'functional_tool_length': self.replacement_extension_length,
+            'effective_length': self.replacement_effective_length,
+            'loading_task_source': '1',
+            'use_tool_time': self.used_tool_time,
+            'production_line_name_id': self.production_line_id.id,
+            'machine_tool_name_id': self.maintenance_equipment_id.id,
+            'applicant': self.applicant,
+            'apply_time': fields.Datetime.now(),
+            'cutter_spacing_code_id': self.cutter_spacing_code_id.id,
+            'whether_standard_knife': self.whether_standard_knife,
+            'reason_for_applying': self.reason_for_applying
+        })
+        print('sf_functional_tool_assembly:', sf_functional_tool_assembly)
+        # 修改机床换刀申请状态
+        record.write({
+            'status': '1',
+            'sf_functional_tool_assembly_id': sf_functional_tool_assembly
+        })
         print('运行成功')
 
         # 关闭弹出窗口
@@ -87,18 +101,35 @@ class ToolTransferRequestInformation(models.TransientModel):
     _name = 'sf.tool.transfer.request.information'
     _description = '刀具转移申请信息'
 
-    CNC_machine_table_id = fields.Many2one('sf.machine_tool', string='CNC机床', readonly=True)
-    machine_tool_code = fields.Char(string='机台号', readonly=True)
-    cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
-    # functional_tool_code = fields.Char(string='功能刀具编码', readonly=True)
+    name = fields.Char('名称', related='maintenance_equipment_id.name', store=True, readonly=True)
+    maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True)
+    production_line_id = fields.Many2one('sf.production.line', string='生产线', readonly=True)
+    machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型', readonly=True)
+    machine_tool_code = fields.Char(string='机台号', store=True, invisible=True, readonly=True)
+    cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True)
+
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
-    functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
+    functional_tool_name = fields.Char(string='功能刀具名称', readonly=True)
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
+    tool_position_interface_type = fields.Selection(
+        [('BT刀柄式', 'BT刀柄式'), ('SK刀柄式', 'SK刀柄式'), ('HSK刀柄式', 'HSK刀柄式'),
+         ('CAT刀柄式', 'CAT刀柄式'), ('ISO刀盘式', 'ISO刀盘式'), ('DIN刀盘式', 'DIN刀盘式'),
+         ('直装固定式', '直装固定式')], string='刀位接口型号', readonly=True)
+    diameter = fields.Integer(string='刀具直径(mm)', readonly=True)
+    knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True)
+    max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True)
+    alarm_value = fields.Integer(string='报警值(min)', readonly=True)
+    used_value = fields.Integer(string='已使用值(min)', readonly=True)
+    whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
+    extension_length = fields.Float(string='伸出长(mm)', readonly=True)
+    effective_length = fields.Float(string='有效长(mm)', readonly=True)
+
+    # 转移刀具信息
     transfer_target = fields.Selection([('机台', '机台'),
                                         ('线边刀库', '线边刀库'),
                                         ('刀具房', '刀具房')], string='转移到:', default='线边刀库')
-
     new_cnc_machine_table_id = fields.Many2one('sf.machine_tool', string='机床名称')
+    new_production_line_id = fields.Many2one('sf.production.line', string='生产线')
     new_machine_tool_code = fields.Char(string='机床号')
     new_cutter_spacing_code = fields.Char(string='目标刀位号')
 
@@ -142,7 +173,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 整体式刀具型号
     integral_code_id = fields.Many2one('stock.lot', string='整体式刀具序列号',
                                        domain=[('product_id.cutting_tool_material_id.name', '=', '整体式刀具')])
-    cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号', readonly=True)
+    cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号',
+                                                     readonly=True)
     integral_name = fields.Char('整体式刀具名称', readonly=True)
     sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', string='整体式刀具品牌', readonly=True)
 
@@ -156,28 +188,32 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     # 刀杆型号
     bar_code_id = fields.Many2one('stock.lot', '刀杆序列号',
                                   domain=[('product_id.cutting_tool_material_id.name', '=', '刀杆')])
-    cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号', readonly=True)
+    cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号',
+                                                      readonly=True)
     bar_name = fields.Char('刀杆名称', readonly=True)
     sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True)
 
     # 刀盘型号
     pad_code_id = fields.Many2one('stock.lot', '刀盘序列号',
                                   domain=[('product_id.cutting_tool_material_id.name', '=', '刀盘')])
-    cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号', readonly=True)
+    cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号',
+                                                      readonly=True)
     pad_name = fields.Char('刀盘名称', readonly=True)
     sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True)
 
     # 刀柄型号
     handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', required=True,
                                      domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄')])
-    cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号', readonly=True)
+    cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号',
+                                                         readonly=True)
     handle_name = fields.Char('刀柄名称', readonly=True)
     sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True)
 
     # 夹头型号
     chuck_code_id = fields.Many2one('stock.lot', '夹头序列号', required=True,
                                     domain=[('product_id.cutting_tool_material_id.name', '=', '夹头')])
-    cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号', readonly=True)
+    cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号',
+                                                       readonly=True)
     chuck_name = fields.Char('夹头名称', readonly=True, compute='_compute_auto_fill')
     sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True)
 
@@ -456,4 +492,4 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
             'is_standard': self.whether_standard_tool,
             'applicable_range': None,
             'image': None,
-        }
\ No newline at end of file
+        }
diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml
index a569b6f2..caba3017 100644
--- a/sf_tool_management/wizard/wizard_view.xml
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -14,6 +14,7 @@
                         </div>
                         <group>
                             <group>
+                                <field name="production_line_id"/>
                                 <field name="machine_table_type_id"/>
                                 <field name="cutter_spacing_code_id"/>
                                 <field name="tool_position_interface_type"/>
@@ -28,8 +29,8 @@
                                 <field name="functional_tool_type_id"/>
                                 <field name="diameter"/>
                                 <field name="knife_tip_r_angle"/>
-                                <field name="knife_tip_r_angle"/>
-                                <field name="knife_tip_r_angle"/>
+                                <field name="extension_length"/>
+                                <field name="effective_length"/>
                             </group>
                         </group>
                         <group string="待换功能刀具信息">
@@ -39,14 +40,14 @@
                                 <field name="replacement_diameter" string="刀具直径(mm)"/>
                                 <field name="replacement_knife_tip_r_angle" string="刀尖R角(mm)"/>
                                 <field name="replacement_tool_setting_length" string="装刀长(mm)"/>
-                                <field name="replacement_extension__length" string="伸出长(mm)"/>
+                                <field name="replacement_extension_length" string="伸出长(mm)"/>
                                 <field name="replacement_effective_length" string="有效长(mm)"/>
                                 <field name="replacement_tool_coarse_middle_thin" string="粗/中/精"/>
                             </group>
                             <group>
                                 <field name="replacement_max_lifetime_value" string="最大寿命值(min)"/>
                                 <field name="replacement_alarm_value" string="报警值(min)"/>
-                                <field name="replacement_used_value" string="报警值(min)"/>
+                                <field name="replacement_used_value" string="已使用值(min)"/>
                                 <field name="new_former"/>
                                 <field name="replacement_whether_standard_knife" string="是否标准刀"/>
                                 <field name="used_tool_time"/>
@@ -80,22 +81,30 @@
             <field name="arch" type="xml">
                  <form string="刀具转移申请信息">
                     <sheet>
-                        <group string="机床信息">
+                        <div class="oe_title">
+                            <h1>
+                                <field name="maintenance_equipment_id"/>
+                            </h1>
+                        </div>
+                        <group>
                             <group>
-                                <field name="CNC_machine_table_id"/>
-                                <field name="cutter_spacing_code"/>
+                                <field name="production_line_id"/>
+                                <field name="machine_table_type_id"/>
+                                <field name="cutter_spacing_code_id"/>
+                                <field name="tool_position_interface_type"/>
+                                <field name="max_lifetime_value"/>
+                                <field name="alarm_value"/>
+                                <field name="alarm_value"/>
+                                <field name="whether_standard_knife"/>
                             </group>
                             <group>
-                                <field name="machine_tool_code"/>
-                            </group>
-                        </group>
-                        <group string="功能刀具信息">
-                             <group>
-                                <field name="functional_tool_name_id" string="功能刀具名称"/>
-                                <field name="functional_tool_type_id" string="功能刀具类型"/>
-                            </group>
-                            <group>
-                                <field name="barcode_id" string="功能刀具编码"/>
+                                <field name="barcode_id"/>
+                                <field name="functional_tool_name"/>
+                                <field name="functional_tool_type_id"/>
+                                <field name="diameter"/>
+                                <field name="knife_tip_r_angle"/>
+                                <field name="effective_length"/>
+                                <field name="effective_length"/>
                             </group>
                         </group>
                         <group string="刀具转移">
@@ -105,7 +114,8 @@
                         </group>
                         <group>
                             <group>
-                                <field name="new_cnc_machine_table_id" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
+<!--                                <field name="new_cnc_machine_table_id" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>-->
+                                <field name="new_production_line_id" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
                                 <field name="new_machine_tool_code" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
                                 <field name="new_cutter_spacing_code" string="刀位号" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
                                 <field name="magazine_tool_warehouse_district" attrs="{'invisible': [('transfer_target', '!=', '线边刀库')]}"/>