diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index 97c4b47a..03a3678b 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -189,9 +189,9 @@ class MaintenanceStandardImage(models.Model):
('压紧方式', '压紧方式'), ('刀片形状', '刀片形状'), ('冷却方式', '冷却方式')],
string='特征')
equipment_id = fields.Many2many('maintenance.equipment', 'image_id', string='设备')
- equipment_lq_id = fields.Many2many('maintenance.equipment', 'image_lq_id', string='设备')
+ equipment_lq_id = fields.Many2many('maintenance.equipment', 'image_lq_id', string='设备能力特征')
jg_equipment_id = fields.Many2many('sf.machine_tool.type', 'jg_image_id', string='机床型号')
- lq_equipment_id = fields.Many2many('sf.machine_tool.type', 'lq_image_id', string='机床型号')
+ lq_equipment_id = fields.Many2many('sf.machine_tool.type', 'lq_image_id', string='机床型号能力特征')
def _get_ids(self, name_arr):
ability_feature_ids = []
@@ -254,6 +254,8 @@ class ToolGroups(models.Model):
equipment_ids = fields.Many2many('maintenance.equipment', 'ref_maintenance_equipment', string='机台号')
remark = fields.Char('备注', size=50)
+ active = fields.Boolean(string='已归档', default=True)
+
# ==========机床刀具组接口==========
# def _register_tool_groups(self, obj):
# # create_url = '/AutoDeviceApi/MachineToolGroup'
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index 5763b3a0..d1c0c510 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -505,11 +505,23 @@
+
+ 刀具组搜索
+ sf.tool.groups
+
+
+
+
+
+
+
+
+
刀具组
ir.actions.act_window
sf.tool.groups
- tree
+ tree,search
diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index b1d0f50f..7ba273bc 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -27,14 +27,14 @@
-
-
-
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 8fad0b08..22cb1b42 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -42,6 +42,8 @@ class FunctionalCuttingToolEntity(models.Model):
current_location = fields.Char('位置', compute='_compute_current_location_id')
image = fields.Binary('图片', readonly=True)
+ active = fields.Boolean(string='已归档', default=True)
+
@api.depends('barcode_id')
def _compute_current_location_id(self):
for record in self:
@@ -241,6 +243,8 @@ class FunctionalToolWarning(models.Model):
dispose_time = fields.Char('处理时间')
dispose_func = fields.Char('处理方法/措施', readonly=False)
+ active = fields.Boolean(string='已归档', default=True)
+
@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)
@@ -340,6 +344,8 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
sf_functional_tool_assembly_ids = fields.Many2many('sf.functional.tool.assembly', 'sf_functional_tool_assembly_ref',
'功能刀具组装单', readonly=True)
+ active = fields.Boolean(string='已归档', default=True)
+
@api.depends('tool_groups_id', 'diameter', 'knife_tip_r_angle')
def _compute_name(self):
for obj in self:
@@ -511,6 +517,8 @@ class MachineTableToolChangingApply(models.Model):
sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装单', readonly=True)
+ active = fields.Boolean(string='已归档', default=True)
+
@api.depends('alarm_value', 'used_value')
def _compute_functional_tool_status(self):
for record in self:
@@ -677,6 +685,8 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装', readonly=True)
+ active = fields.Boolean(string='已归档', default=True)
+
@api.depends('diameter', 'tool_included_angle', 'tool_groups_id')
def _compute_functional_tool_name(self):
for obj in self:
@@ -928,6 +938,8 @@ class FunctionalToolAssembly(models.Model):
sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan',
'CAM工单程序用刀计划', readonly=True, )
+ active = fields.Boolean(string='已归档', default=True)
+
def _get_code(self, loading_task_source):
"""
自动生成组装单编码
diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py
index f412f119..d62a4b5f 100644
--- a/sf_tool_management/models/tool_material_search.py
+++ b/sf_tool_management/models/tool_material_search.py
@@ -328,6 +328,8 @@ class ToolMaterial(models.Model):
barcode_ids = fields.One2many('stock.lot', 'tool_material_search_id', string='序列号', readonly=True)
+ active = fields.Boolean(string='已归档', default=True)
+
@api.depends('barcode_ids')
def _compute_number(self):
for record in self:
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index bac6533d..239845a4 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -200,6 +200,7 @@
+
@@ -269,6 +270,7 @@
+
@@ -417,6 +419,7 @@
+
@@ -749,6 +752,7 @@
+
@@ -772,7 +776,7 @@
CAM工单程序用刀计划
sf.cam.work.order.program.knife.plan
-
+
@@ -806,7 +810,7 @@
CAM工单程序用刀计划
sf.cam.work.order.program.knife.plan
-