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

Accept Merge Request #388: (feature/刀具优化 -> develop)

Browse Source 
Merge Request: 修改机床换刀申请字段状态，新增选择字段提示；

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/388?initial=true
This commit is contained in:
禹翔辉
2023-09-15 09:52:01 +08:00
committed by Coding
parent 99f078fad9 9e212a2684
commit 480d628125
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_tool_management/models/base.py
View File

@@ -551,7 +551,7 @@ class MachineTableToolChangingApply(models.Model):
name = fields.Many2one('maintenance.equipment', string='CNC机床',required=True, readonly=False,
group_expand='_read_group_names')
machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=True,
machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型', readonly=True,
compute='_compute_name')
machine_tool_code = fields.Char(string='机台号', invisible=True, readonly=True, compute='_compute_name')
cutter_spacing_code = fields.Char(string='刀位号', readonly=False)
@@ -595,7 +595,7 @@ class MachineTableToolChangingApply(models.Model):
def _compute_name(self):
for record in self:
if record:
record.machine_table_type_id = record.name.machine_tool_category.id
record.machine_table_type_id = record.name.category_id.id
record.machine_tool_code = record.name.code
@api.depends('functional_tool_name_id')

14
sf_tool_management/views/tool_base_views.xml
View File

@@ -870,7 +870,7 @@
<sheet>
<div class="oe_title">
<h1>
<field name="name" readonly="1"/>
<field name="name" readonly="0" placeholder="请选择"/>
</h1>
</div>
<group>
@@ -879,7 +879,7 @@
<field name="machine_tool_code" invisible="True"/>
<field name="cutter_spacing_code"/>
<field name="functional_tool_code"/>
<field name="functional_tool_name_id"/>
<field name="functional_tool_name_id" placeholder="请选择"/>
<field name="functional_tool_type_id"/>
</group>
</group>
@@ -999,19 +999,19 @@
<sheet>
<div class="oe_title">
<h1>
<field name="name" readonly="1"/>
<field name="name" readonly="0" placeholder="请输入工单任务编号"/>
</h1>
</div>
<group>
<group>
<field name="cam_procedure_code"/>
<field name="cam_cutter_spacing_code"/>
<field name="machine_table_name_id"/>
<field name="machine_table_name_id" placeholder="请选择"/>
</group>
<group>
<field name="functional_tool_code"/>
<field name="functional_tool_name_id"/>
<field name="functional_tool_type_id"/>
<field name="functional_tool_name_id" placeholder="请选择"/>
<field name="functional_tool_type_id" placeholder="请选择"/>
<field name="machine_tool_cutter_spacing_code"/>
</group>
</group>
@@ -1027,7 +1027,7 @@
<field name="coarse_middle_thin"/>
</group>
<group>
<field name="need_knife_time"/>
<field name="need_knife_time" placeholder="请选择"/>
<field name="required_cutting_time"/>
<field name="whether_standard_tool"/>
<field name="applicant"/>

8
sf_tool_management/wizard/wizard_view.xml
View File

@@ -23,15 +23,15 @@
</group>
<group string="功能刀具信息">
<group>
<field name="replacement_tool_name_id"/>
<field name="replacement_tool_name_id" placeholder="请选择"/>
<field name="replacement_tool_type_id"/>
<field name="replacement_tool_coarse_middle_thin"/>
<field name="replacement_tool_coarse_middle_thin" placeholder="请选择"/>
<field name="applicant"/>
</group>
<group>
<field name="replacement_tool_code"/>
<field name="used_tool_time"/>
<field name="new_former"/>
<field name="used_tool_time" placeholder="请选择"/>
<field name="new_former" placeholder="请选择"/>
<field name="reason_for_applying"/>
</group>