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

# Conflicts:
#	sf_manufacturing/security/ir.model.access.csv

sf_manufacturing/models/mrp_production.py

@@ -8,6 +8,8 @@ from odoo.exceptions import UserError
 from odoo.addons.sf_base.commons.common import Common
 from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
 
+from odoo.tools import float_compare, float_is_zero
+
 
 class MrpProduction(models.Model):
     _inherit = 'mrp.production'
@@ -259,9 +261,6 @@ class MrpProduction(models.Model):
                     )
                     i += 1
                     for route in product_routing_workcenter:
-                        if i == 1 and route.routing_type == '获取CNC加工程序':
-                            workorders_values.append(
-                                self.env['mrp.workorder'].json_workorder_str('', production, route))
                         if route.is_repeat is True:
                             workorders_values.append(
                                 self.env['mrp.workorder'].json_workorder_str(k, production, route))
@@ -479,13 +478,100 @@ class MrpProduction(models.Model):
             for work in rec.workorder_ids:
                 work.sequence = current_sequence
                 current_sequence += 1
-                if work.name == '获取CNC加工程序':
-                    work.button_start()
-                    #work.fetchCNC()
-                    work.button_finish()
+                # if work.name == '获取CNC加工程序':
+                #     work.button_start()
+                #     #work.fetchCNC()
+                #     work.button_finish()
 
     # 创建工单并进行排序
     def _create_workorder(self):
         self._create_workorder3()
         self._reset_work_order_sequence()
         return True
+
+    #修改标记已完成方法
+    def button_mark_done1(self):
+        self._button_mark_done_sanity_checks()
+
+        if not self.env.context.get('button_mark_done_production_ids'):
+            self = self.with_context(button_mark_done_production_ids=self.ids)
+        res = self._pre_button_mark_done()
+        if res is not True:
+            return res
+
+        if self.env.context.get('mo_ids_to_backorder'):
+            productions_to_backorder = self.browse(self.env.context['mo_ids_to_backorder'])
+            productions_not_to_backorder = self - productions_to_backorder
+        else:
+            productions_not_to_backorder = self
+            productions_to_backorder = self.env['mrp.production']
+
+
+        backorders = productions_to_backorder and productions_to_backorder._split_productions()
+        backorders = backorders - productions_to_backorder
+
+        productions_not_to_backorder._post_inventory(cancel_backorder=True)
+        productions_to_backorder._post_inventory(cancel_backorder=True)
+
+        # if completed products make other confirmed/partially_available moves available, assign them
+        done_move_finished_ids = (productions_to_backorder.move_finished_ids | productions_not_to_backorder.move_finished_ids).filtered(lambda m: m.state == 'done')
+        done_move_finished_ids._trigger_assign()
+
+        # Moves without quantity done are not posted => set them as done instead of canceling. In
+        # case the user edits the MO later on and sets some consumed quantity on those, we do not
+        # want the move lines to be canceled.
+        (productions_not_to_backorder.move_raw_ids | productions_not_to_backorder.move_finished_ids).filtered(lambda x: x.state not in ('done', 'cancel')).write({
+            'state': 'done',
+            'product_uom_qty': 0.0,
+        })
+
+        for production in self:
+            production.write({
+                'date_finished': fields.Datetime.now(),
+                'product_qty': production.qty_produced,
+                'priority': '0',
+                'is_locked': True,
+                'state': 'done',
+            })
+
+        for workorder in self.workorder_ids.filtered(lambda w: w.state not in ('done', 'cancel')):
+            workorder.duration_expected = workorder._get_duration_expected()
+
+        if not backorders:
+            if self.env.context.get('from_workorder'):
+                return {
+                    'type': 'ir.actions.act_window',
+                    'res_model': 'mrp.production',
+                    'views': [[self.env.ref('mrp.mrp_production_form_view').id, 'form']],
+                    'res_id': self.id,
+                    'target': 'main',
+                }
+            if self.user_has_groups('mrp.group_mrp_reception_report') and self.picking_type_id.auto_show_reception_report:
+                lines = self.move_finished_ids.filtered(lambda m: m.product_id.type == 'product' and m.state != 'cancel' and m.quantity_done and not m.move_dest_ids)
+                if lines:
+                    if any(mo.show_allocation for mo in self):
+                        action = self.action_view_reception_report()
+                        return action
+            return True
+        context = self.env.context.copy()
+        context = {k: v for k, v in context.items() if not k.startswith('default_')}
+        for k, v in context.items():
+            if k.startswith('skip_'):
+                context[k] = False
+        action = {
+            'res_model': 'mrp.production',
+            'type': 'ir.actions.act_window',
+            'context': dict(context, mo_ids_to_backorder=None, button_mark_done_production_ids=None)
+        }
+        if len(backorders) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': backorders[0].id,
+            })
+        else:
+            action.update({
+                'name': _("Backorder MO"),
+                'domain': [('id', 'in', backorders.ids)],
+                'view_mode': 'tree,form',
+            })
+        return action

sf_manufacturing/models/mrp_routing_workcenter.py

@@ -6,9 +6,9 @@ class ResMrpRoutingWorkcenter(models.Model):
     _inherit = 'mrp.routing.workcenter'
 
     routing_type = fields.Selection([
-        ('获取CNC加工程序', '获取CNC加工程序'),
-        ('装夹', '装夹'),
-        ('前置三元定位检测', '前置三元定位检测'),
+        # ('获取CNC加工程序', '获取CNC加工程序'),
+        ('装夹预调', '装夹预调'),
+        # ('前置三元定位检测', '前置三元定位检测'),
         ('CNC加工', 'CNC加工'),
         ('后置三元质量检测', '后置三元质量检测'),
         ('解除装夹', '解除装夹'),

sf_manufacturing/models/mrp_workorder.py

@@ -31,9 +31,9 @@ class ResMrpWorkOrder(models.Model):
     processing_panel = fields.Char('加工面')
     sequence = fields.Integer(string='工序')
     routing_type = fields.Selection([
-        ('获取CNC加工程序', '获取CNC加工程序'),
-        ('装夹', '装夹'),
-        ('前置三元定位检测', '前置三元定位检测'),
+        # ('获取CNC加工程序', '获取CNC加工程序'),
+        ('装夹预调', '装夹预调'),
+        # ('前置三元定位检测', '前置三元定位检测'),
         ('CNC加工', 'CNC加工'),
         ('后置三元质量检测', '后置三元质量检测'),
         ('解除装夹', '解除装夹'),
@@ -204,15 +204,15 @@ class ResMrpWorkOrder(models.Model):
         if route.routing_type == '切割':
             duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
                 [('name', '=', '切割')]).time_cycle
-        elif route.routing_type == '获取CNC加工程序':
+        # elif route.routing_type == '获取CNC加工程序':
+        #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        #         [('name', '=', '获取CNC加工程序')]).time_cycle
+        elif route.routing_type == '装夹预调':
             duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', '获取CNC加工程序')]).time_cycle
-        elif route.routing_type == '工件装夹':
-            duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', '工件装夹')]).time_cycle
-        elif route.routing_type == '前置三元定位检测':
-            duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', '前置三元定位检测')]).time_cycle
+                [('name', '=', '装夹预调')]).time_cycle
+        # elif route.routing_type == '前置三元定位检测':
+        #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        #         [('name', '=', '前置三元定位检测')]).time_cycle
         elif route.routing_type == 'CNC加工':
             duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
                 [('name', '=', 'CNC加工')]).time_cycle
@@ -495,7 +495,7 @@ class ResMrpWorkOrder(models.Model):
 
     # 重写工单开始按钮方法
     def button_start(self):
-        if self.routing_type == '装夹' and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
+        if self.routing_type == '装夹预调' and self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name:
             self.pro_code = self.production_id.move_raw_ids[0].move_line_ids[0].lot_id.name
         # 外协出库单，从“正在等待”变为“就绪”状态
         if self.is_subcontract is True:
@@ -581,7 +581,8 @@ class ResMrpWorkOrder(models.Model):
         if is_production_id == True and self.name == '解除装夹':
             for move_raw_id in self.production_id.move_raw_ids:
                 move_raw_id.quantity_done = move_raw_id.product_uom_qty
-                self.production_id.state = 'done'
+            self.production_id.button_mark_done1()
+                # self.production_id.state = 'done'
 
 
 

sf_manufacturing/models/product_template.py

@@ -62,7 +62,6 @@ class ResProductMo(models.Model):
     tool_thickness = fields.Float('厚度(mm)')
     tool_weight = fields.Float('重量(kg)')
     tool_hardness = fields.Integer('硬度(hrc)')
-
     coating_material = fields.Char('涂层材质')
     # 整体式刀具特有字段
     cutting_tool_total_length = fields.Float('总长度(mm)', digits=(6, 1))
@@ -97,8 +96,8 @@ class ResProductMo(models.Model):
     handle_type_id = fields.Many2one('maintenance.equipment.image', '柄部类型', domain=[('type', '=', '柄部类型')])
     cutting_direction_ids = fields.Many2many('maintenance.equipment.image', 'rel_cutting_product_template',
                                              '走刀方向', domain=[('type', '=', '走刀方向')])
-    suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'rel_coolant_product_template',
-                                            '适合冷却液', domain=[('type', '=', '冷却液')])
+    suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'rel_coolants_product_template',
+                                            '适合冷却方式', domain=[('type', '=', '冷却方式')])
     compaction_way_id = fields.Many2one('maintenance.equipment.image',
                                         '压紧方式', domain=[('type', '=', '压紧方式')])
 
@@ -202,7 +201,6 @@ class ResProductMo(models.Model):
                 self.feed_per_tooth_ids = self.cutting_tool_model_id.feed_per_tooth_ids.filtered(
                     lambda r: int(r.blade_diameter) == int(self.specification_id.blade_diameter))
             elif self.cutting_tool_type == '夹头':
-                self.cutting_tool_clamping_tolerance = self.specification_id.clamping_tolerance
                 self.cutting_tool_clamping_diameter_min = self.specification_id.min_clamping_diameter
                 self.cutting_tool_clamping_diameter_min = self.specification_id.max_clamping_diameter
                 self.cutting_tool_clamping_way = self.specification_id.clamping_mode
@@ -213,7 +211,7 @@ class ResProductMo(models.Model):
                 self.cutting_tool_jump_accuracy = self.specification_id.run_out_accuracy
                 self.cutting_tool_max_load_capacity = self.specification_id.max_load_capacity
                 self.cutting_tool_er_size_model = self.specification_id.er_size_model
-                self.cutting_tool_handle_ids = self.cutting_tool_model_id.handle_ids
+                self.cutting_tool_handle_id = self.cutting_tool_model_id.handle_id.id
                 self.cooling_suit_type_ids = self.specification_id.cooling_jacket
             elif self.cutting_tool_type == '刀片':
                 self.cutting_tool_total_length = self.specification_id.total_length
@@ -262,7 +260,7 @@ class ResProductMo(models.Model):
                 self.cutting_tool_top_angle = self.specification_id.top_angle
                 self.cutting_tool_screw = self.specification_id.screw
                 self.cutting_tool_wrench = self.specification_id.wrench
-                self.cutting_tool_blade_id = self.specification_id.blade_id
+                self.cutting_tool_blade_id = self.specification_id.blade_id.id
                 self.cutting_tool_is_cooling_hole = self.specification_id.is_cooling_hole
                 self.cutting_tool_locating_slot_code = self.specification_id.locating_slot_code
                 self.cutting_tool_install_blade_tip_num = self.specification_id.install_blade_tip_num
@@ -474,7 +472,6 @@ class ResProductMo(models.Model):
     cutting_tool_dynamic_balance_class = fields.Char('动平衡等级')
     cutting_tool_fit_nut_model = fields.Char('适用锁紧螺母型号')
 
-
     # 夹头参数
     cutting_tool_taper = fields.Integer('锥度(°)')
     cutting_tool_top_diameter = fields.Float('顶部直径')
@@ -483,11 +480,17 @@ class ResProductMo(models.Model):
     cooling_suit_type_ids = fields.Char('适用冷却套型号')
     cutting_tool_max_load_capacity = fields.Float('最大负载能力(kg)')
     cutting_tool_er_size_model = fields.Char('尺寸型号')
-    cutting_tool_handle_ids = fields.Many2many(
+    # cutting_tool_handle_ids = fields.Many2many(
+    #     'sf.cutting_tool.standard.library',
+    #     relation='product_cutting_tool_library_chuck_handle_rel',
+    #     column1='model_id_1',
+    #     column2='model_id_2',
+    #     domain="[('cutting_tool_type', '=', '刀柄')]",
+    #     string='适用刀柄型号'
+    # )
+
+    cutting_tool_handle_id = fields.Many2one(
         'sf.cutting_tool.standard.library',
-        relation='product_cutting_tool_library_chuck_handle_rel',
-        column1='model_id_1',
-        column2='model_id_2',
         domain="[('cutting_tool_type', '=', '刀柄')]",
         string='适用刀柄型号'
     )
@@ -517,36 +520,6 @@ class ResProductMo(models.Model):
         if self.tool_thickness > 1000000:
             raise ValidationError("厚度不能超过1000000")
 
-    @api.constrains('fixture_clamp_workpiece_length_max')
-    def _check_fixture_clamp_workpiece_length_max_size(self):
-        if self.fixture_clamp_workpiece_length_max > 1000000:
-            raise ValidationError("夹持工件长度MAX不能超过1000000")
-
-    @api.constrains('fixture_clamp_workpiece_width_max')
-    def _check_fixture_clamp_workpiece_width_max_size(self):
-        if self.fixture_clamp_workpiece_width_max > 1000000:
-            raise ValidationError("夹持工件宽度MAX不能超过1000000")
-
-    @api.constrains('fixture_clamp_workpiece_height_max')
-    def _check_fixture_clamp_workpiece_height_max_size(self):
-        if self.fixture_clamp_workpiece_height_max > 1000000:
-            raise ValidationError("夹持工件高度MAX不能超过1000000")
-
-    @api.constrains('fixture_maximum_clamping_force')
-    def _check_fixture_maximum_clamping_force_size(self):
-        if self.fixture_maximum_clamping_force > 100000000:
-            raise ValidationError("最大夹持力不能超过100000000")
-
-    @api.constrains('fixture_through_hole_size')
-    def _check_fixture_through_hole_size_size(self):
-        if self.fixture_through_hole_size > 1000000:
-            raise ValidationError("过孔大小不能超过1000000")
-
-    @api.constrains('fixture_screw_size')
-    def _check_fixture_through_hole_size_size(self):
-        if self.fixture_screw_size > 1000000:
-            raise ValidationError("螺牙大小不能超过1000000")
-
     def _json_apply_machine_tool_type_item_code(self, item):
         code_arr = []
         for i in item.product_id.fixture_apply_machine_tool_type_ids:
@@ -565,12 +538,6 @@ class ResProductMo(models.Model):
             code_arr.append(i.code)
         return code_arr
 
-    def _json_handle_item_code(self, item):
-        code_arr = []
-        for i in item.product_id.cutting_tool_handle_ids:
-            code_arr.append(i.code)
-        return code_arr
-
     def _get_ids(self, param):
         type_ids = []
         if not param:
@@ -586,41 +553,6 @@ class ResProductMo(models.Model):
             self.detailed_type = 'product'
             self.sale_ok = False
 
-    @api.onchange('fixture_material_id')
-    def _onchange_fixture_material_id(self):
-        for item in self:
-            if item.fixture_material_id.id != item.fixture_model_id.fixture_material_id.id:
-                item.fixture_model_id = False
-
-    @api.onchange('fixture_model_id')
-    def _onchange_fixture_model_id(self):
-        for item in self:
-            if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具', '虎钳夹具', '零点卡盘']:
-                item.brand_id = item.fixture_model_id.brand_id.id
-                item.fixture_model_file = item.fixture_model_id.model_file
-                item.tool_length = item.fixture_model_id.length
-                item.tool_width = item.fixture_model_id.width
-                item.tool_height = item.fixture_model_id.height
-                item.tool_weight = item.fixture_model_id.weight
-                item.materials_type_id = item.fixture_model_id.materials_model_id.id
-                item.fixture_maximum_carrying_weight = item.fixture_model_id.maximum_carrying_weight
-                item.fixture_maximum_clamping_force = item.fixture_model_id.maximum_clamping_force
-                if self.fixture_material_type in ['零点卡盘', '转接板(锁板)夹具']:
-                    item.fixture_clamping_way = item.fixture_model_id.clamping_way
-                    item.fixture_port_type = item.fixture_model_id.port_type
-                if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具']:
-                    item.fixture_driving_way = item.fixture_model_id.driving_way
-                if self.fixture_material_type in ['气动夹具', '磁吸夹具', '虎钳夹具', '零点卡盘']:
-                    item.fixture_through_hole_size = item.fixture_model_id.through_hole_size
-                    item.fixture_screw_size = item.fixture_model_id.screw_size
-                if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具', '虎钳夹具']:
-                    item.fixture_clamp_workpiece_length_max = item.fixture_model_id.clamp_workpiece_length_max
-                    item.fixture_clamp_workpiece_width_max = item.fixture_model_id.clamp_workpiece_width_max
-                    item.fixture_clamp_workpiece_height_max = item.fixture_model_id.clamp_workpiece_height_max
-                    item.fixture_clamp_workpiece_diameter_max = item.fixture_model_id.clamp_workpiece_diameter_max
-                    item.fixture_apply_machine_tool_type_ids = self._get_ids(
-                        item.fixture_model_id.apply_machine_tool_type_ids)
-
     def _get_volume_uom_id_from_ir_config_parameter(self):
         product_length_in_feet_param = self.env['ir.config_parameter'].sudo().get_param('product.volume_in_cubic_feet')
         if product_length_in_feet_param == '1':
@@ -804,15 +736,12 @@ class ResProductFixture(models.Model):
     fixture_model_id = fields.Many2one('sf.fixture.model', '夹具型号')
     specification_fixture_id = fields.Many2one('sf.fixture.materials.basic.parameters', '夹具规格')
 
-    fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料", required=True)
+    fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料")
     fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
-    multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型", required=True)
+    multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
     model_file = fields.Binary(string="3D模型图")
 
     # 夹具物料基本参数
-    # length = fields.Float('长度(mm)', digits=(16, 2))
-    # width = fields.Float('宽度(mm)', digits=(16, 2))
-    # height = fields.Float('高度(mm)', digits=(16, 2))
     diameter = fields.Float('直径(mm)', digits=(16, 2))
 
     # '零点卡盘' 字段

sf_manufacturing/security/ir.model.access.csv

@@ -6,10 +6,10 @@ access_sf_model_type_manager,sf_model_type,model_sf_model_type,sf_base.group_sf_
 access_sf_product_model_type_routing_sort,sf_product_model_type_routing_sort,model_sf_product_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_product_model_type_routing_sort_manager,sf_product_model_type_routing_sort,model_sf_product_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0
 access_sf_embryo_model_type_routing_sort,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0
-access_sf_embryo_model_type_routing_sort_manager,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,1
+access_sf_embryo_model_type_routing_sort_manager,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0
 access_sf_surface_technics_model_type_routing_sort,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_surface_technics_model_type_routing_sort_manager,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,sf_base.group_sf_mrp_manager,1,1,1,0
-access_sf_production_line,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_user,1,0,0,0
+access_sf_production_line,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_user,1,1,1,0
 access_sf_production_line_manager,sf.production.line,model_sf_production_line,sf_base.group_sf_mrp_manager,1,1,1,0
 access_maintenance_equipment_tool,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_base.group_sf_mrp_user,1,0,0,0
 access_maintenance_equipment_tool_manager,maintenance_equipment_tool,model_maintenance_equipment_tool,sf_base.group_sf_mrp_manager,1,1,1,0
@@ -42,7 +42,7 @@ access_mrp_production_stock_worker,mrp.production stock_worker,mrp.model_mrp_pro
 access_product_product_user,product.product user,product.model_product_product,sf_base.group_sf_mrp_user,1,0,0,0
 access_product_template_user,product.template user,product.model_product_template,sf_base.group_sf_mrp_user,1,0,0,0
 access_uom_uom_user,uom.uom user,uom.model_uom_uom,sf_base.group_sf_mrp_user,1,0,0,0
-access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,sf_base.group_sf_mrp_user,1,1,1,0
+access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,sf_base.group_sf_mrp_user,1,0,0,0
 access_res_partner,res.partner,base.model_res_partner,sf_base.group_sf_mrp_user,1,0,0,0
 access_mrp_workorder_mrp_user,mrp.workorder.user,mrp.model_mrp_workorder,sf_base.group_sf_mrp_user,1,1,1,0
 access_mrp_workorder_mrp_manager,mrp.workorder,mrp.model_mrp_workorder,sf_base.group_sf_mrp_user,1,1,1,0
@@ -91,6 +91,7 @@ access_mrp_production,mrp_production,model_mrp_production,sf_base.group_plan_dis
 access_mrp_workorder,mrp_workorder,model_mrp_workorder,sf_base.group_plan_dispatch,1,1,1,0
 access_sf_production_line_group_plan_dispatch,sf.production.line,model_sf_production_line,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_production_line_group_plan_director,sf.production.line,model_sf_production_line,sf_base.group_plan_director,1,1,1,0
+access_sf_production_line,sf.production.line,model_sf_production_line,sf_maintenance.sf_group_equipment_user,1,1,1,0
 access_mrp_workcenter,mrp_workcenter,model_mrp_workcenter,sf_base.group_plan_dispatch,1,1,1,0
 access_mrp_bom,mrp.bom,mrp.model_mrp_bom,sf_base.group_plan_dispatch,1,1,1,0
 access_mrp_bom_line,mrp.bom.line,mrp.model_mrp_bom_line,sf_base.group_plan_dispatch,1,0,0,0

sf_manufacturing/views/mrp_workorder_view.xml

@@ -162,11 +162,11 @@
                     <field name="equipment_id"
                            attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
                     <field name="functional_fixture_id"
-                           attrs='{"invisible": [("routing_type","!=","装夹")]}'/>
+                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                     <field name="functional_fixture_code" force_save="1"
-                           attrs='{"invisible": [("routing_type","!=","装夹")]}'/>
+                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                     <field name="functional_fixture_type_id" force_save="1"
-                           attrs='{"invisible": [("routing_type","!=","装夹")]}'/>
+                           attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                 </group>
                 <group attrs='{"invisible": [("routing_type","=","获取CNC加工程序")]}'>
                     <div>
@@ -219,7 +219,7 @@
 
                 <!--                    </div>-->
                 <!--                </page>-->
-                <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹")]}'>
+                <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
                     <group>
                         <group string="卡盘">
                             <field name="chuck_serial_number"/>
@@ -241,10 +241,7 @@
                                placeholder="如有预调程序信息请在此处输入....."/>
                     </group>
                 </page>
-
-            </xpath>
-            <xpath expr="//page[1]" position="before">
-                <page string="前置三元检测定位参数" attrs='{"invisible": [("routing_type","!=","前置三元定位检测")]}'>
+                <page string="前置三元检测定位参数" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
 
                     <div>左面:</div>
                     <div class="o_address_format">
@@ -397,8 +394,10 @@
                         <field name='X_deviation_angle'/>
                     </group>
                 </page>
+
             </xpath>
 
+
             <xpath expr="//page[1]" position="before">
                 <page string="CNC程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
                     <field name="cnc_ids" widget="one2many" string="工作程序">