jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复权限

Browse Source 
# Conflicts:
#	sf_dlm_management/views/product_template_management_view.xml
This commit is contained in:
jinling.yang
2024-02-29 15:32:54 +08:00
parent c262110b9a dac0c4e767
commit c1da64fc36
7 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_base/models/tool_base_new.py
View File

@@ -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'

14
sf_base/views/tool_views.xml
View File

@@ -505,11 +505,23 @@
</field>
</record>
<record id="sf_tool_groups_search" model="ir.ui.view">
<field name="name">刀具组搜索</field>
<field name="model">sf.tool.groups</field>
<field name="arch" type="xml">
<search>
<field name="name"/>
<field name="equipment_ids"/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
</search>
</field>
</record>
<record id="sf_tool_groups_view_act" model="ir.actions.act_window">
<field name="name">刀具组</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.tool.groups</field>
<field name="view_mode">tree</field>
<field name="view_mode">tree,search</field>
</record>
<!-- ================================================刀具基础参数================================================ -->