diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 2abcc2e7..8b799eac 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from odoo import fields, models, api
+from odoo import SUPERUSER_ID
 
 
 # class FunctionalCuttingToolEntity(models.Model):
@@ -179,14 +180,21 @@ class FunctionalToolWarning(models.Model):
     install_tool_time = fields.Char("装刀时间", readonly=False)
     outbound_time = fields.Char('出库时间', readonly=False)
     on_board_time = fields.Char('上机时间', readonly=False)
+    machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=False, tracking=True,
+                                            group_expand='_read_group_machine_table_name_ids')
+    @api.model
+    def _read_group_machine_table_name_ids(self, categories, domain, order):
+        machine_table_name_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
+        return categories.browse(machine_table_name_ids)
+
     machine_tool_code = fields.Char('机台号', readonly=False)
     cutting_tool_code = fields.Char('刀位号', readonly=False)
     idle_time = fields.Char('闲置时长', readonly=False)
     alarm_value = fields.Char('报警值', readonly=False)
     used_value = fields.Char('已使用值', readonly=False)
     alarm_type = fields.Char('报警类型', readonly=False)
-    alarm_time = fields.Char('报警时间', readonly=False)
     dispose_user = fields.Char('处理人', readonly=False)
+    alarm_time = fields.Char('报警时间', readonly=False)
     dispose_time = fields.Char('处理时间', readonly=False)
     dispose_func = fields.Char('处理方法/措施', readonly=False)
     remark = fields.Char('备注', readonly=False)
@@ -250,17 +258,36 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
     image = fields.Binary('图片', readonly=True)
 
     # 功能刀具实时分布
-    tool_stock_num = fields.Char(string='刀具房库存数量', readonly=False)
-    side_shelf_num = fields.Char(string='线边货架货架数量', readonly=False)
-    on_tool_stock_num = fields.Char(string='机内刀库库存数量', readonly=False)
-    tool_stock_total = fields.Char(string='合计', readonly=False)
-    return_reuse_num_re = fields.Char(string='归还再用数量(精)', readonly=False)
-    return_reuse_num_co = fields.Char(string='归还再用数量(粗)', readonly=False)
-    return_processing_num = fields.Char(string='归还需磨削数量', readonly=False)
-    return_total = fields.Char(string='合计', readonly=False)
-    total = fields.Char(string='总计', readonly=False)
+    tool_stock_num = fields.Integer(string='刀具房库存数量', readonly=False)
+    side_shelf_num = fields.Integer(string='线边货架货架数量', readonly=False)
+    on_tool_stock_num = fields.Integer(string='机内刀库库存数量', readonly=False)
+    tool_stock_total = fields.Integer(string='合计(库存)', readonly=True, compute='_compute_tool_stock_total')
+    return_reuse_num_re = fields.Integer(string='归还再用数量(精)', readonly=False)
+    return_reuse_num_co = fields.Integer(string='归还再用数量(粗)', readonly=False)
+    return_processing_num = fields.Integer(string='归还需磨削数量', readonly=False)
+    return_total = fields.Integer(string='合计(归还)', readonly=True, compute='_compute_return_total')
+    total = fields.Integer(string='总计', readonly=True, compute='_compute_total')
     remark = fields.Char(string='备注/说明', readonly=False)
 
+    @api.depends('tool_stock_num', 'side_shelf_num', 'on_tool_stock_num')
+    def _compute_tool_stock_total(self):
+        for record in self:
+            if record:
+                self.tool_stock_total = record.tool_stock_num + record.side_shelf_num + record.on_tool_stock_num
+
+    @api.depends('return_reuse_num_re', 'return_reuse_num_co', 'return_processing_num')
+    def _compute_return_total(self):
+        for record in self:
+            if record:
+                self.return_total = record.return_reuse_num_re + record.return_reuse_num_co + record.return_processing_num
+
+    @api.depends('tool_stock_total', 'return_total')
+    def _compute_total(self):
+        for record in self:
+            if record:
+                self.total = record.tool_stock_total + record.return_total
+
+
 
 class InboundAndOutboundRecordsOfFunctionalTools(models.Model):
     _name = 'sf.inbound.and.outbound.records.of.functional.tools'
@@ -347,9 +374,9 @@ class MachineTableToolChangingApply(models.Model):
     #     string='换刀需求信息',
     #     attrs="{'invisible': 1}")
 
-    name = fields.Many2one('sf.machine_tool', string='CNC机床', readonly=False)
-    machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=False)
-    machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}")
+    name = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=False,tracking=True, group_expand='_read_group_names')
+    machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=True, compute='_compute_name')
+    machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}", readonly=True, compute='_compute_name')
     cutter_spacing_code = fields.Char(string='刀位号', readonly=False)
     functional_tool_code = fields.Char(string='功能刀具编码', readonly=True, compute='_compute_functional_tool_name_id')
     functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False)
@@ -363,9 +390,9 @@ class MachineTableToolChangingApply(models.Model):
     used_value = fields.Char(string='已使用值', readonly=False)
     functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态', default='正常', readonly=False)
 
-    replacement_tool_code = fields.Char(string='待换刀具编码', readonly=True)
-    replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换刀具名称', readonly=True)
-    replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换刀具类型', readonly=True)
+    replacement_tool_code = fields.Char(string='待换功能刀具编码', readonly=True)
+    replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换功能刀具名称', readonly=True)
+    replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型', readonly=True)
     replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
                                                            string='粗/中/精', readonly=True)
     new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
@@ -376,6 +403,20 @@ class MachineTableToolChangingApply(models.Model):
 
     status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移')], string='操作状态', default='0')
 
+    sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装')
+
+    @api.model
+    def _read_group_names(self, categories, domain, order):
+        names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
+        return categories.browse(names)
+
+    @api.depends('name')
+    def _compute_name(self):
+        for record in self:
+            if record:
+                record.machine_table_type_id = record.name.machine_tool_category.id
+                record.machine_tool_code = record.name.code
+
     @api.depends('functional_tool_name_id')
     def _compute_functional_tool_name_id(self):
         for record in self:
@@ -383,7 +424,6 @@ class MachineTableToolChangingApply(models.Model):
                 record.functional_tool_code = record.functional_tool_name_id.code
                 record.functional_tool_type_id = record.functional_tool_name_id.mrs_cutting_tool_type_id.id
 
-
     @api.onchange('functional_tool_status')
     def automation_apply_for_tool_change(self):
         """
@@ -459,7 +499,8 @@ class MachineTableToolChangingApply(models.Model):
             'used_tool_time': None,
             'reason_for_applying': None,
             'remark': None,
-            'status': '0'
+            'status': '0',
+            'sf_functional_tool_assembly_id': None,
         })
 
 
@@ -473,6 +514,16 @@ class MachineTableToolChangingApply(models.Model):
             'status': '0'
         })
 
+    def open_sf_functional_tool_assembly(self):
+        """
+        跳转到功能刀具组装界面按键功能
+        :return:
+        """
+        action = self.env.ref('sf_tool_management.sf_functional_tool_assembly_view_act')
+        result = action.read()[0]
+        result['domain'] = [('sf_machine_table_tool_changing_apply_id', '=', self.id)]
+        return result
+
 
 class CAMWorkOrderProgramKnifePlan(models.Model):
     _name = 'sf.cam.work.order.program.knife.plan'
@@ -484,16 +535,22 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
     functional_tool_code = fields.Char(string='功能刀具编码', readonly=False)
     functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False)
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False)
-    machine_table_name_id = fields.Many2one('sf.machine_tool', string='机床名称', readonly=False)
+    machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=False, tracking=True, group_expand='_read_group_machine_table_name_ids')
+
+    @api.model
+    def _read_group_machine_table_name_ids(self, categories, domain, order):
+        machine_table_name_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
+        return categories.browse(machine_table_name_ids)
+
     machine_tool_cutter_spacing_code = fields.Char(string='机床刀位号', readonly=False)
     diameter = fields.Char(string='直径（程式）', readonly=False)
     tool_loading_length = fields.Char(string='装刀长', readonly=False)
     clearance_length = fields.Char(string='避空长', readonly=False)
     tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=False)
     L_D = fields.Char(string='L/D', readonly=False)
-    coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False)
-    required_cutting_time = fields.Char(string='需要切割时间', readonly=False)
-    whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=False)
+    coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False, default='2')
+    required_cutting_time = fields.Char(string='需切削时长', readonly=False)
+    whether_standard_tool = fields.Selection([('1', '是'), ('0', '否')],string='是否标准刀', readonly=False, default='1')
     need_knife_time = fields.Datetime(string='需要用刀时间', readonly=False)
     plan_execute_status = fields.Selection([('0', '待下发'), ('1', '执行中'), ('2', '已完成')],
                                            string='计划执行状态', default='0', readonly=False)
@@ -501,12 +558,14 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
     reason_for_applying = fields.Char(string='申请原因', readonly=False)
     remark = fields.Char(string='备注说明', readonly=False)
 
+    sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装')
+
     def apply_for_tooling(self):
         """
         申请装刀
         :return:
         """
-        self.env['sf.functional.tool.assembly'].create({
+        record = self.env['sf.functional.tool.assembly'].create({
             'functional_tool_code': self.functional_tool_code,
             'name': self.functional_tool_name_id.id,
             'functional_tool_type_id': self.functional_tool_type_id.id,
@@ -520,33 +579,43 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
             'use_tool_time': self.need_knife_time,
             'machine_tool_name_id': self.machine_table_name_id.id,
             'machine_tool_code': self.cam_procedure_code,
-            'cutter_spacing_code': self.cam_cutter_spacing_code
+            'cutter_spacing_code': self.cam_cutter_spacing_code,
+            'sf_cam_work_order_program_knife_plan_id': self.id
         })
+        self.sf_functional_tool_assembly_id = record.id
 
         # 将计划执行状态改为执行中
         self.env['sf.cam.work.order.program.knife.plan'].search(
-            [('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '1',
-                                                                               'applicant': self.env.user.name})
-
+            [('functional_tool_code', '=', self.functional_tool_code)]).write({
+            'plan_execute_status': '1',
+            'applicant': self.env.user.name})
 
     def revocation(self):
         """
         撤回装刀申请
         :return:
         """
-
-
         self.env['sf.functional.tool.assembly'].search(
             [('functional_tool_code', '=', self.functional_tool_code),
              ('loading_task_source', '=', '0')]).unlink()
 
-        # 将计划执行状态改为待执行
+        # 将计划执行状态改为待执行，同时清除申请人、功能刀具组装字段数据
         self.env['sf.cam.work.order.program.knife.plan'].search(
-            [('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '0',
-                                                                               'applicant': None})
-
-
+            [('functional_tool_code', '=', self.functional_tool_code)]).write({
+            'plan_execute_status': '0',
+            'applicant': None,
+            'sf_functional_tool_assembly_id': None,
+        })
 
+    def open_sf_functional_tool_assembly(self):
+        """
+        跳转到功能刀具组装界面按键功能
+        :return:
+        """
+        action = self.env.ref('sf_tool_management.sf_functional_tool_assembly_view_act')
+        result = action.read()[0]
+        result['domain'] = [('sf_cam_work_order_program_knife_plan_id', '=', self.id)]
+        return result
 
 
 class FunctionalToolAssembly(models.Model):
@@ -554,9 +623,17 @@ class FunctionalToolAssembly(models.Model):
     _description = '功能刀具组装'
     _order = 'use_tool_time asc'
 
+
     functional_tool_code = fields.Char(string='功能刀具编码', readonly=True)
     name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True)
-    functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
+    functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
+                                              tracking=True, group_expand='_read_group_functional_tool_type_ids')
+    @api.model
+    def _read_group_functional_tool_type_ids(self, categories, domain, order):
+        """读取分组自定义以便在看板视图中显示所有的类别，即使它们为空"""
+        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='功能刀具直径', readonly=True)
     functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True)
     functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
@@ -605,7 +682,6 @@ class FunctionalToolAssembly(models.Model):
     chuck_name = fields.Char('夹头名称', readonly=True)
     sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True)
 
-
     coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
     tool_loading_length = fields.Char(string='装刀长', readonly=True)
     new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
@@ -621,7 +697,7 @@ class FunctionalToolAssembly(models.Model):
     assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装'), ('2', '已出库')],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('sf.machine_tool', string='机床名称', readonly=True)
+    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)
 
@@ -632,12 +708,26 @@ class FunctionalToolAssembly(models.Model):
     remark = fields.Char(string='备注说明', readonly=True)
 
     check_box_1 = fields.Boolean(string='复选框', default=False, readonly=False)
+    sf_machine_table_tool_changing_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', '机床换刀申请')
+    sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan', 'CAM工单程序用刀计划')
 
-    @api.onchange('assemble_status')
-    def check_box(self):
-        if self.assemble_status != '1':
-            self.check_box_1 = False
+    def open_sf_cam_work_order_program_knife_plan(self):
+        """
+        跳转到CAM工单程序用刀计划界面按钮功能
+        """
+        action = self.env.ref('sf_tool_management.sf_cam_work_order_program_knife_plan_view_act')
+        result = action.read()[0]
+        result['domain'] = [('sf_functional_tool_assembly_id', '=', self.id)]
+        return result
 
+    def open_sf_machine_table_tool_changing_apply(self):
+        """
+        跳转到机床换刀申请界面按钮功能
+        """
+        action = self.env.ref('sf_tool_management.sf_machine_table_tool_changing_apply_view_act')
+        result = action.read()[0]
+        result['domain'] = [('sf_functional_tool_assembly_id', '=', self.id)]
+        return result
 
     def cancel_functional_tool_assembly(self):
         """
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 298ae51c..37220acb 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -235,7 +235,7 @@
                     <field name="dispose_func" optional="show"/>
                     <field name="remark" optional="show"/>
                     <searchpanel>
-                        <field name="mrs_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
+                        <field name="machine_table_name_id" string="CNC机床列表" icon="fa-building" enable_counters="1"/>
                     </searchpanel>
                 </search>
             </field>
@@ -313,17 +313,34 @@
                             <page string="实时分布信息">
                                 <group>
                                     <group>
-                                        <field name="tool_stock_num"/>
-                                        <field name="side_shelf_num"/>
-                                        <field name="on_tool_stock_num"/>
-                                        <field name="tool_stock_total"/>
+                                        <group>
+                                            <field name="tool_stock_num"/>
+                                            <field name="return_reuse_num_re"/>
+                                        </group>
+                                        <group>
+                                            <field name="side_shelf_num"/>
+                                            <field name="return_reuse_num_co"/>
+                                        </group>
+<!--                                        <field name="tool_stock_num"/>-->
+<!--                                        <field name="side_shelf_num"/>-->
+<!--                                        <field name="on_tool_stock_num"/>-->
+<!--                                        <field name="tool_stock_total"/>-->
                                     </group>
                                     <group>
-                                        <field name="return_reuse_num_re"/>
-                                        <field name="return_reuse_num_co"/>
-                                        <field name="return_processing_num"/>
-                                        <field name="return_total"/>
-                                        <field name="total"/>
+                                        <group>
+                                            <field name="on_tool_stock_num"/>
+                                            <field name="return_processing_num"/>
+                                        </group>
+                                        <group>
+                                            <field name="tool_stock_total"/>
+                                            <field name="return_total"/>
+                                            <field name="total"/>
+                                        </group>
+<!--                                        <field name="return_reuse_num_re"/>-->
+<!--                                        <field name="return_reuse_num_co"/>-->
+<!--                                        <field name="return_processing_num"/>-->
+<!--                                        <field name="return_total"/>-->
+<!--                                        <field name="total"/>-->
                                     </group>
                                 </group>
                             </page>
@@ -551,6 +568,9 @@
                                 type="action"
                                 context="{  'default_name':name,
                                         'default_machine_tool_code': machine_tool_code,
+                                        'default_functional_tool_code': functional_tool_code,
+                                        'default_functional_tool_name_id': functional_tool_name_id,
+                                        'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_cutter_spacing_code': cutter_spacing_code,
                                         'default_replacement_tool_code': functional_tool_code,
                                         'default_replacement_tool_name_id': functional_tool_name_id,
@@ -571,8 +591,10 @@
                                 class="btn-primary"
                                 attrs="{'invisible': [('status', '!=', '0')]}"
                         />
-                        <button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}"/>
-                        <button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}"/>
+                        <button string="查看组装单" type="object" name="open_sf_functional_tool_assembly"
+                            class="oe_highlight" attrs="{'invisible': [('status', '!=', '1')]}"/>
+                        <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>
@@ -588,6 +610,9 @@
                                 type="action"
                                 context="{  'default_name':name,
                                         'default_machine_tool_code': machine_tool_code,
+                                        'default_functional_tool_code': functional_tool_code,
+                                        'default_functional_tool_name_id': functional_tool_name_id,
+                                        'default_functional_tool_type_id': functional_tool_type_id,
                                         'default_cutter_spacing_code': cutter_spacing_code,
                                         'default_replacement_tool_code': functional_tool_code,
                                         'default_replacement_tool_name_id': functional_tool_name_id,
@@ -606,11 +631,12 @@
                                         'default_functional_tool_name_id': functional_tool_name_id,
                                         'default_functional_tool_type_id': functional_tool_type_id}"
                                 class="btn-primary"
-                                attrs="{'invisible': [('status', '!=', '0')]}"
-                        />
-                        <button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}"/>
-                        <button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}"/>
-                    </header>
+                                attrs="{'invisible': [('status', '!=', '0')]}"/>
+                         <button string="查看组装单" type="object" name="open_sf_functional_tool_assembly"
+                                 class="oe_highlight" attrs="{'invisible': [('status', '!=', '1')]}"/>
+                         <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>
                         <group string="基础信息">
                             <group>
@@ -639,7 +665,7 @@
                                 <field name="used_value"/>
                             </group>
                         </group>
-                        <group string="待换刀具信息">
+                        <group string="待换功能刀具信息">
                             <group>
                                 <field name="replacement_tool_name_id"/>
                                 <field name="replacement_tool_type_id"/>
@@ -678,7 +704,7 @@
                     <field name="replacement_tool_name_id"/>
                     <field name="applicant"/>
                     <searchpanel>
-                        <field name="name" string="CNC机床" enable_counters="1" icon="fa-filter"/>
+                        <field name="name" enable_counters="1" icon="fa-building"/>
                     </searchpanel>
                 </search>
             </field>
@@ -710,7 +736,9 @@
                     <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')]}"/>
+                    <button string="查看组装单" type="object" name="open_sf_functional_tool_assembly"
+                                 class="oe_highlight" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
+                    <button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
                 </tree>
             </field>
         </record>
@@ -722,7 +750,9 @@
                 <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')]}"/>
+                        <button string="查看组装单" type="object" name="open_sf_functional_tool_assembly"
+                                 class="oe_highlight" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
+                        <button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
                     </header>
 
                     <sheet>
@@ -836,8 +866,13 @@
                                     'default_whether_standard_tool': None}"
                                attrs="{'invisible': [('assemble_status', '!=', '0')]}"
                                class="btn-primary"/>
-                    <button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
+                    <button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary" confirm="是否确认取消组装"/>
                     <button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
+                    <button string="组装单打印" name="assemble_single_print" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}"  class="btn-primary" confirm="是否确认打印组装单"/>
+                    <button string="查看CAM工单程序用刀计划" type="object" name="open_sf_cam_work_order_program_knife_plan"
+                                 class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '0')]}" />
+                    <button string="查看机床换刀申请" type="object" name="open_sf_machine_table_tool_changing_apply"
+                                 class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '1')]}" />
                 </tree>
             </field>
         </record>
@@ -867,13 +902,17 @@
                                attrs="{'invisible': [('assemble_status', '!=', '0')]}"
                                class="btn-primary"/>
 
-                       <button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
+                       <button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary" confirm="是否确认取消组装"/>
 
-                       <button string="自动打印二维码" name="automatic_printing_of_QR_code" type="object" 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="是否确认打印二维码"/>
 
-                       <button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
+                        <button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
 
-                       <button string="组装单打印" name="assemble_single_print" type="object" 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="是否确认打印组装单"/>
+                        <button string="查看CAM工单程序用刀计划" type="object" name="open_sf_cam_work_order_program_knife_plan"
+                                 class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '0')]}" />
+                        <button string="查看机床换刀申请" type="object" name="open_sf_machine_table_tool_changing_apply"
+                                 class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '1')]}" />
                     </header>
                     <sheet>
                        <group string="功能刀具信息">
@@ -890,32 +929,32 @@
                        </group>
                        <group string="组装物料信息">
                            <group>
-                               <field name="integral_code"/>
-                               <field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
-                               <field name="blade_code"/>
-                               <field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
-                               <field name="bar_code"/>
-                               <field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
-                               <field name="pad_code"/>
-                               <field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
-                               <field name="handle_code"/>
-                               <field name="mrs_cutting_tool_cutterhandle_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
-                               <field name="chuck_code"/>
-                               <field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
+                               <field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_integral_model_ids', '=', [])]}"/>
+                               <field name="integral_code" attrs="{'invisible':[('mrs_cutting_tool_integral_model_ids', '=', [])]}"/>
+                               <field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_blade_model_ids', '=', [])]}"/>
+                               <field name="blade_code" attrs="{'invisible':[('mrs_cutting_tool_blade_model_ids', '=', [])]}"/>
+                               <field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_cutterbar_model_ids', '=', [])]}"/>
+                               <field name="bar_code" attrs="{'invisible':[('mrs_cutting_tool_cutterbar_model_ids', '=', [])]}"/>
+                               <field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_cutterpad_model_ids', '=', [])]}"/>
+                               <field name="pad_code" attrs="{'invisible':[('mrs_cutting_tool_cutterpad_model_ids', '=', [])]}"/>
+                               <field name="mrs_cutting_tool_cutterhandle_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_cutterhandle_model_ids', '=', [])]}"/>
+                               <field name="handle_code" attrs="{'invisible':[('mrs_cutting_tool_cutterhandle_model_ids', '=', [])]}"/>
+                               <field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_cutterhead_model_ids', '=', [])]}"/>
+                               <field name="chuck_code" attrs="{'invisible':[('mrs_cutting_tool_cutterhead_model_ids', '=', [])]}"/>
                            </group>
                            <group>
-                               <field name="integral_name"/>
-                               <field name="sf_tool_brand_id_1"/>
-                               <field name="blade_name"/>
-                               <field name="sf_tool_brand_id_2"/>
-                               <field name="bar_name"/>
-                               <field name="sf_tool_brand_id_3"/>
-                               <field name="pad_name"/>
-                               <field name="sf_tool_brand_id_4"/>
-                               <field name="handle_name"/>
-                               <field name="sf_tool_brand_id_5"/>
-                               <field name="chuck_name"/>
-                               <field name="sf_tool_brand_id_6"/>
+                               <field name="integral_name" attrs="{'invisible':[('mrs_cutting_tool_integral_model_ids', '=', [])]}"/>
+                               <field name="sf_tool_brand_id_1" attrs="{'invisible':[('mrs_cutting_tool_integral_model_ids', '=', [])]}"/>
+                               <field name="blade_name" attrs="{'invisible':[('mrs_cutting_tool_blade_model_ids', '=', [])]}"/>
+                               <field name="sf_tool_brand_id_2" attrs="{'invisible':[('mrs_cutting_tool_blade_model_ids', '=', [])]}"/>
+                               <field name="bar_name" attrs="{'invisible':[('mrs_cutting_tool_cutterbar_model_ids', '=', [])]}"/>
+                               <field name="sf_tool_brand_id_3" attrs="{'invisible':[('mrs_cutting_tool_cutterbar_model_ids', '=', [])]}"/>
+                               <field name="pad_name" attrs="{'invisible':[('mrs_cutting_tool_cutterpad_model_ids', '=', [])]}"/>
+                               <field name="sf_tool_brand_id_4" attrs="{'invisible':[('mrs_cutting_tool_cutterpad_model_ids', '=', [])]}"/>
+                               <field name="handle_name" attrs="{'invisible':[('mrs_cutting_tool_cutterhandle_model_ids', '=', [])]}"/>
+                               <field name="sf_tool_brand_id_5" attrs="{'invisible':[('mrs_cutting_tool_cutterhandle_model_ids', '=', [])]}"/>
+                               <field name="chuck_name" attrs="{'invisible':[('mrs_cutting_tool_cutterhead_model_ids', '=', [])]}"/>
+                               <field name="sf_tool_brand_id_6" attrs="{'invisible':[('mrs_cutting_tool_cutterhead_model_ids', '=', [])]}"/>
                            </group>
                        </group>
                         <group string="组装参数信息">
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index a4ebf243..c89d3911 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -1,4 +1,4 @@
-from odoo import fields, models
+from odoo import fields, models, api
 
 
 class ToolChangeRequirementInformation(models.TransientModel):
@@ -7,13 +7,17 @@ class ToolChangeRequirementInformation(models.TransientModel):
 
     # tool_change_to_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', string='机床换刀申请')
 
-    name = fields.Many2one('sf.machine_tool', string='CNC机床', readonly=True)
+    name = fields.Many2one('maintenance.equipment', 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)
+    functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True)
+    functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
 
-    replacement_tool_code = fields.Char(string='待换刀具编码')
-    replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换刀具名称')
-    replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换刀具类型')
+    replacement_tool_code = fields.Char(string='待换功能刀具编码', readonly=True)
+    replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换功能刀具名称')
+    replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型',
+                                               readonly=True)
     replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
                                                            string='粗/中/精')
     new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧')
@@ -22,11 +26,39 @@ class ToolChangeRequirementInformation(models.TransientModel):
     reason_for_applying = fields.Char(string='申请原因')
     remark = fields.Char(string='备注说明')
 
+    @api.onchange('replacement_tool_name_id')
+    def _onchange_replacement_tool_name_id(self):
+        for record in self:
+            if record:
+                record.replacement_tool_code = record.replacement_tool_name_id.code
+                record.replacement_tool_type_id = record.replacement_tool_name_id.mrs_cutting_tool_type_id.id
+
     def tool_changing_apply(self):
         """
         确认换刀申请（按键）
         :return:
         """
+        # 将数据更新到机台换刀申请界面
+        record = self.env['sf.machine.table.tool.changing.apply'].search(
+            [('name', '=', self.name.id),
+             ('machine_tool_code', '=', self.machine_tool_code),
+             ('cutter_spacing_code', '=', self.cutter_spacing_code),
+             ])
+
+        # 功能刀具组装创建新任务(new_assembly_task)
+        record_1 = self.env['sf.functional.tool.assembly'].sudo().create({
+            'functional_tool_code': self.replacement_tool_code,
+            'name': 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,
+        })
         # 封装数据
         desc = {
             'name': self.name.id,
@@ -41,26 +73,10 @@ class ToolChangeRequirementInformation(models.TransientModel):
             'used_tool_time': self.used_tool_time,
             'reason_for_applying': self.reason_for_applying,
             'remark': self.new_former,
-            'status': '1'
+            'status': '1',
+            'sf_functional_tool_assembly_id': record_1.id,
         }
-        print('desc:', desc)
-        # 将数据更新到机台换刀申请界面
-        self.env['sf.machine.table.tool.changing.apply'].search(
-            [('name', '=', desc.get('name'))]).write(desc)
-
-        # 功能刀具组装创建新任务
-        self.env['sf.machine.table.tool.changing.apply'].new_assembly_task({
-            'functional_tool_code': self.replacement_tool_code,
-            'name': 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
-        })
+        record.write(desc)
 
         # 关闭弹出窗口
         return {'type': 'ir.actions.act_window_close'}
@@ -105,9 +121,9 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     _description = '功能刀具组装单'
 
     # 功能刀具申请信息
-    machine_tool_name_id = fields.Many2one('sf.machine_tool', string='机床名称', readonly=True)
-    code = fields.Char(string='功能刀具编码', readonly=True)
+    machine_tool_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=True)
     cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
+    code = fields.Char(string='功能刀具编码', readonly=True)
     functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True)
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
     functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True)
@@ -115,62 +131,128 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     functional_tool_diameter = fields.Char(string='功能刀具直径', readonly=True)
     tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=True)
     functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=True)
-    required_cutting_time = fields.Char(string='需要切割时间', readonly=True)
+    required_cutting_time = fields.Char(string='需切削时长', readonly=True)
     whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=True)
 
     # 功能刀具组装信息
     # 整体式刀具型号
-    mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
+    mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
+                                                           'sf_functional_tool_assembly_order_id',
                                                            string='整体式刀具型号', readonly=False, domain=
                                                            [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
-    integral_code = fields.Char('整体式刀具序列号')
-    integral_name = fields.Char('整体式刀具名称')
-    sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌')
+    integral_code = fields.Char('整体式刀具序列号', readonly=True,
+                                compute='_compute_mrs_cutting_tool_integral_model_ids')
+    integral_name = fields.Char('整体式刀具名称', readonly=True)
+    sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌', readonly=True)
     # 刀片型号
     mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
                                                         string='刀片型号', readonly=False, domain=
                                                         [('mrs_cutting_tool_material_name', '=', '刀片')])
-    blade_code = fields.Char('刀片序列号')
-    blade_name = fields.Char('刀片名称')
-    sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌')
+    blade_code = fields.Char('刀片序列号', readonly=True, compute='_compute_mrs_cutting_tool_blade_model_ids')
+    blade_name = fields.Char('刀片名称', readonly=True)
+    sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True)
     # 刀杆型号
-    mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
+    mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
+                                                            'sf_functional_tool_assembly_order_id',
                                                             string='刀杆型号', readonly=False, domain=
                                                             [('mrs_cutting_tool_material_name', '=', '刀杆')])
-    bar_code = fields.Char('刀杆序列号')
-    bar_name = fields.Char('刀杆名称')
-    sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌')
+    bar_code = fields.Char('刀杆序列号', readonly=True, compute='_compute_mrs_cutting_tool_cutterbar_model_ids')
+    bar_name = fields.Char('刀杆名称', readonly=True)
+    sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True)
     # 刀盘型号
-    mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
+    mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
+                                                            'sf_functional_tool_assembly_order_id',
                                                             string='刀盘型号', readonly=False, domain=
                                                             [('mrs_cutting_tool_material_name', '=', '刀盘')])
-    pad_code = fields.Char('刀盘序列号')
-    pad_name = fields.Char('刀盘名称')
-    sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌')
+    pad_code = fields.Char('刀盘序列号', readonly=True, compute='_compute_mrs_cutting_tool_cutterpad_model_ids')
+    pad_name = fields.Char('刀盘名称', readonly=True)
+    sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True)
 
     # 刀柄型号
-    mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
+    mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
+                                                               'sf_functional_tool_assembly_order_id',
                                                                string='刀柄型号', readonly=False, domain=
                                                                [('mrs_cutting_tool_material_name', '=', '刀柄')])
-    handle_code = fields.Char('刀柄序列号')
-    handle_name = fields.Char('刀柄名称')
-    sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌')
+    handle_code = fields.Char('刀柄序列号', readonly=True, compute='_compute_mrs_cutting_tool_cutterhandle_model_ids')
+    handle_name = fields.Char('刀柄名称', readonly=True)
+    sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True)
     # 夹头型号
-    mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
+    mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
+                                                             'sf_functional_tool_assembly_order_id',
                                                              string='夹头型号', readonly=False, domain=
                                                              [('mrs_cutting_tool_material_name', '=', '夹头')])
-    chuck_code = fields.Char('夹头序列号')
-    chuck_name = fields.Char('夹头名称')
-    sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌')
+    chuck_code = fields.Char('夹头序列号', readonly=True, compute='_compute_mrs_cutting_tool_cutterhead_model_ids')
+    chuck_name = fields.Char('夹头名称', readonly=True)
+    sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True)
 
-    coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精')
+    coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', default='1')
     tool_loading_length = fields.Char(string='装刀长')
-    new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧')
+    new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', required=True, default='1')
     reference_length = fields.Char(string='参考伸出长')
     cut_time = fields.Char(string='已切削时间')
     cut_length = fields.Char(string='已切削长度')
     cut_number = fields.Char(string='已切削次数')
 
+    @api.depends('mrs_cutting_tool_integral_model_ids')
+    def _compute_mrs_cutting_tool_integral_model_ids(self):
+        if not self.mrs_cutting_tool_integral_model_ids:
+            self.integral_code = None
+        for val in self.mrs_cutting_tool_integral_model_ids:
+            if val:
+                self.integral_code = val.code
+                self.integral_name = val.name
+                self.sf_tool_brand_id_1 = val.mrs_machine_brand_id.id
+
+    @api.depends('mrs_cutting_tool_blade_model_ids')
+    def _compute_mrs_cutting_tool_blade_model_ids(self):
+        if not self.mrs_cutting_tool_blade_model_ids:
+            self.blade_code = None
+        for val in self.mrs_cutting_tool_blade_model_ids:
+            if val:
+                self.blade_code = val.code
+                self.blade_name = val.name
+                self.sf_tool_brand_id_2 = val.mrs_machine_brand_id.id
+
+    @api.depends('mrs_cutting_tool_cutterbar_model_ids')
+    def _compute_mrs_cutting_tool_cutterbar_model_ids(self):
+        if not self.mrs_cutting_tool_cutterbar_model_ids:
+            self.bar_code = None
+        for val in self.mrs_cutting_tool_cutterbar_model_ids:
+            if val:
+                self.bar_code = val.code
+                self.bar_name = val.name
+                self.sf_tool_brand_id_3 = val.mrs_machine_brand_id.id
+
+    @api.depends('mrs_cutting_tool_cutterpad_model_ids')
+    def _compute_mrs_cutting_tool_cutterpad_model_ids(self):
+        if not self.mrs_cutting_tool_cutterpad_model_ids:
+            self.pad_code = None
+        for val in self.mrs_cutting_tool_cutterpad_model_ids:
+            if val:
+                self.pad_code = val.code
+                self.pad_name = val.name
+                self.sf_tool_brand_id_4 = val.mrs_machine_brand_id.id
+
+    @api.depends('mrs_cutting_tool_cutterhandle_model_ids')
+    def _compute_mrs_cutting_tool_cutterhandle_model_ids(self):
+        if not self.mrs_cutting_tool_cutterhandle_model_ids:
+            self.handle_code = None
+        for val in self.mrs_cutting_tool_cutterhandle_model_ids:
+            if val:
+                self.handle_code = val.code
+                self.handle_name = val.name
+                self.sf_tool_brand_id_5 = val.mrs_machine_brand_id.id
+
+    @api.depends('mrs_cutting_tool_cutterhead_model_ids')
+    def _compute_mrs_cutting_tool_cutterhead_model_ids(self):
+        if not self.mrs_cutting_tool_cutterhead_model_ids:
+            self.chuck_code = None
+        for val in self.mrs_cutting_tool_cutterhead_model_ids:
+            if val:
+                self.chuck_code = val.code
+                self.chuck_name = val.name
+                self.sf_tool_brand_id_6 = val.mrs_machine_brand_id.id
+
     def functional_tool_assembly(self):
         """
         功能刀具组装
@@ -326,6 +408,3 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
                     'receive_person': self.env.user.name,
                     'receive_time': fields.Datetime.now()
                 })
-
-
-
diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml
index a8101f6d..fcb8853c 100644
--- a/sf_tool_management/wizard/wizard_view.xml
+++ b/sf_tool_management/wizard/wizard_view.xml
@@ -10,23 +10,26 @@
                         <group string="机床信息" col="3">
                             <group>
                                 <field name="name"/>
+                                <field name="functional_tool_code"/>
                             </group>
                             <group>
                                 <field name="machine_tool_code"/>
+                                <field name="functional_tool_name_id"/>
                             </group>
                             <group>
                                 <field name="cutter_spacing_code"/>
+                                <field name="functional_tool_type_id"/>
                             </group>
                         </group>
-                        <group string="刀具信息">
+                        <group string="功能刀具信息">
                             <group>
                                 <field name="replacement_tool_name_id"/>
-                                <field name="replacement_tool_code"/>
+                                <field name="replacement_tool_type_id"/>
                                 <field name="replacement_tool_coarse_middle_thin"/>
                                 <field name="applicant"/>
                             </group>
                             <group>
-                                <field name="replacement_tool_type_id"/>
+                                <field name="replacement_tool_code"/>
                                 <field name="used_tool_time"/>
                                 <field name="new_former"/>
                                 <field name="reason_for_applying"/>
@@ -68,13 +71,13 @@
                                 <field name="machine_tool_code"/>
                             </group>
                         </group>
-                        <group string="刀具信息">
+                        <group string="功能刀具信息">
                              <group>
-                                <field name="functional_tool_name_id" string="刀具名称"/>
-                                <field name="functional_tool_type_id" string="刀具类型"/>
+                                <field name="functional_tool_name_id" string="功能刀具名称"/>
+                                <field name="functional_tool_type_id" string="功能刀具类型"/>
                             </group>
                             <group>
-                                <field name="functional_tool_code" string="刀具编码"/>
+                                <field name="functional_tool_code" string="功能刀具编码"/>
                             </group>
                         </group>
                         <group string="刀具转移">
@@ -188,29 +191,34 @@
 <!--                        </group>-->
                         <group string="组装物料信息">
                            <group>
-                               <field name="integral_code"/>
-                               <field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}"
-                                      widget="many2many_tags" placeholder="选择整体式刀具型号"/>
-                               <field name="blade_code"/>
-                               <field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
-                               <field name="bar_code"/>
-                               <field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
-                               <field name="pad_code"/>
-                               <field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
+                               <field name="mrs_cutting_tool_integral_model_ids" string="整体式刀具型号"
+                                      options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible': [('mrs_cutting_tool_blade_model_ids', '!=', [])]}"/>
+                               <field name="integral_code" attrs="{'invisible': [('mrs_cutting_tool_blade_model_ids', '!=', [])]}"/>
+                               <field name="mrs_cutting_tool_blade_model_ids" string="刀片型号"
+                                      options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible': [('mrs_cutting_tool_integral_model_ids', '!=', [])]}"/>
+                               <field name="blade_code" attrs="{'invisible': [('mrs_cutting_tool_integral_model_ids', '!=', [])]}"/>
+                               <field name="mrs_cutting_tool_cutterbar_model_ids" string="刀杆型号"
+                                      options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"
+                                      attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterpad_model_ids', '!=', [])]}"/>
+                               <field name="bar_code" attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterpad_model_ids', '!=', [])]}"/>
+                               <field name="mrs_cutting_tool_cutterpad_model_ids" string="刀盘型号"
+                                      options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"
+                                      attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterbar_model_ids', '!=', [])]}"/>
+                               <field name="pad_code"  attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterbar_model_ids', '!=', [])]}"/>
+                               <field name="mrs_cutting_tool_cutterhandle_model_ids" string="刀柄型号" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
                                <field name="handle_code"/>
-                               <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" string="夹头型号" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
                                <field name="chuck_code"/>
-                               <field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
                            </group>
                            <group>
-                               <field name="integral_name"/>
-                               <field name="sf_tool_brand_id_1"/>
-                               <field name="blade_name"/>
-                               <field name="sf_tool_brand_id_2"/>
-                               <field name="bar_name"/>
-                               <field name="sf_tool_brand_id_3"/>
-                               <field name="pad_name"/>
-                               <field name="sf_tool_brand_id_4"/>
+                               <field name="integral_name" attrs="{'invisible': [('mrs_cutting_tool_blade_model_ids', '!=', [])]}"/>
+                               <field name="sf_tool_brand_id_1" attrs="{'invisible': [('mrs_cutting_tool_blade_model_ids', '!=', [])]}"/>
+                               <field name="blade_name" attrs="{'invisible': [('mrs_cutting_tool_integral_model_ids', '!=', [])]}"/>
+                               <field name="sf_tool_brand_id_2" attrs="{'invisible': [('mrs_cutting_tool_integral_model_ids', '!=', [])]}"/>
+                               <field name="bar_name" attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterpad_model_ids', '!=', [])]}"/>
+                               <field name="sf_tool_brand_id_3" attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterpad_model_ids', '!=', [])]}"/>
+                               <field name="pad_name" attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterbar_model_ids', '!=', [])]}"/>
+                               <field name="sf_tool_brand_id_4" attrs="{'invisible': ['|',('mrs_cutting_tool_integral_model_ids', '!=', []),('mrs_cutting_tool_cutterbar_model_ids', '!=', [])]}"/>
                                <field name="handle_name"/>
                                <field name="sf_tool_brand_id_5"/>
                                <field name="chuck_name"/>