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

Merge remote-tracking branch 'origin/feature/夹具型号同步' into feature/产品添加夹具型号信息

Browse Source
This commit is contained in:
yuxianghui
2024-01-05 14:43:48 +08:00
parent bc3325bd3b 831a91c925
commit e5bf0d8205
9 changed files with 546 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_tool_management/models/base.py
View File

@@ -791,7 +791,7 @@ class FunctionalToolAssembly(models.Model):
L_D_number = fields.Float(string='L/D值(mm)', readonly=True)
hiding_length = fields.Float(string='避空长(mm)', readonly=True)
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
# functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
tool_loading_person = fields.Char(string='装刀人', readonly=True)
tool_loading_time = fields.Datetime(string='装刀时间', readonly=True)
remark = fields.Char(string='备注说明', readonly=True)

6
sf_tool_management/views/tool_base_views.xml
View File

@@ -878,7 +878,7 @@
<field name="whether_standard_knife" invisible="True"/>
<field name="reason_for_applying" invisible="True"/>
<field name="functional_tool_type_id" invisible="True"/>
<field name="functional_tool_cutting_type" invisible="True"/>
<!-- <field name="functional_tool_cutting_type" invisible="True"/>-->
<button string="组装"
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
@@ -900,7 +900,6 @@
'default_new_former':new_former,
'default_use_tool_time':use_tool_time,
'default_reason_for_applying':reason_for_applying,
'default_functional_tool_cutting_type':functional_tool_cutting_type,
}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
@@ -937,7 +936,6 @@
'default_new_former':new_former,
'default_use_tool_time':use_tool_time,
'default_reason_for_applying':reason_for_applying,
'default_functional_tool_cutting_type':functional_tool_cutting_type,
}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
@@ -1116,7 +1114,7 @@
<field name="new_former"/>
<field name="use_tool_time"/>
<field name="reason_for_applying"/>
<field name="functional_tool_cutting_type"/>
<!-- <field name="functional_tool_cutting_type"/>-->
</group>
</group>
</page>

2
sf_tool_management/wizard/wizard.py
View File

@@ -330,7 +330,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
L_D_number = fields.Float(string='L/D值(mm)', compute='_compute_l_d_number')
hiding_length = fields.Float(string='避空长(mm)')
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
# functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
@api.onchange('integral_code_id')
def _onchange_after_assembly_functional_tool_diameter(self):

2
sf_tool_management/wizard/wizard_view.xml
View File

@@ -190,7 +190,7 @@
<field name="new_former"/>
<field name="use_tool_time"/>
<field name="reason_for_applying"/>
<field name="functional_tool_cutting_type"/>
<!-- <field name="functional_tool_cutting_type"/>-->
</group>
</group>
<group string="组装物料信息" col="1">