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

新增刀具管理按键使用提示，调整相关按键布局；新增机床换刀申请、CAM装刀申请界面、功能刀具组装界面的tree视图左侧分组显示全部信息；优化三个界面相关字段；新增功能刀具组装界面刀具物料信息无数据隐藏，功能刀具组装申请组装界面刀具物料信息根据不同情况隐藏；新增功能刀具组装的刀具物料字段根据所选型号自动带出。

Browse Source
This commit is contained in:
yuxianghui
2023-08-08 18:08:53 +08:00
parent 7fb585dfdd
commit b2012c004a
4 changed files with 210 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
sf_tool_management/views/tool_base_views.xml
View File

@@ -551,6 +551,8 @@
type="action"
context="{ 'default_name':name,
'default_machine_tool_code': machine_tool_code,
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id,
'default_cutter_spacing_code': cutter_spacing_code,
'default_replacement_tool_code': functional_tool_code,
'default_replacement_tool_name_id': functional_tool_name_id,
@@ -571,8 +573,8 @@
class="btn-primary"
attrs="{'invisible': [('status', '!=', '0')]}"
/>
<button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}"/>
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}"/>
<button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}" confirm="是否确认撤回换刀申请"/>
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
</tree>
</field>
</record>
@@ -588,6 +590,8 @@
type="action"
context="{ 'default_name':name,
'default_machine_tool_code': machine_tool_code,
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id,
'default_cutter_spacing_code': cutter_spacing_code,
'default_replacement_tool_code': functional_tool_code,
'default_replacement_tool_name_id': functional_tool_name_id,
@@ -608,8 +612,8 @@
class="btn-primary"
attrs="{'invisible': [('status', '!=', '0')]}"
/>
<button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}"/>
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}"/>
<button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}" confirm="是否确认撤回换刀申请"/>
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
</header>
<sheet>
<group string="基础信息">
@@ -639,7 +643,7 @@
<field name="used_value"/>
</group>
</group>
<group string="待换刀具信息">
<group string="待换功能刀具信息">
<group>
<field name="replacement_tool_name_id"/>
<field name="replacement_tool_type_id"/>
@@ -678,9 +682,14 @@
<field name="replacement_tool_name_id"/>
<field name="applicant"/>
<searchpanel>
<field name="name" string="CNC机床" enable_counters="1" icon="fa-filter"/>
<field name="name" enable_counters="1" icon="fa-building"/>
</searchpanel>
</search>
<!-- <xpath expr="//field[@name='name']" position="after">-->
<!-- <searchpanel>-->
<!-- <field name="name" icon="fa-building" enable_counters="1" domain="[('name', '!=', False)]"/>-->
<!-- </searchpanel>-->
<!-- </xpath>-->
</field>
</record>
@@ -710,7 +719,7 @@
<field name="remark" optional="hide"/>
<field name="plan_execute_status" invisible="True"/>
<button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
<button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
<button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
</tree>
</field>
</record>
@@ -722,7 +731,7 @@
<form>
<header>
<button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
<button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
<button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
</header>
<sheet>
@@ -836,8 +845,9 @@
'default_whether_standard_tool': None}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
<button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary" confirm="是否确认取消组装"/>
<button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="组装单打印" name="assemble_single_print" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印组装单"/>
</tree>
</field>
</record>
@@ -867,13 +877,13 @@
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
<button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary" confirm="是否确认取消组装"/>
<button string="自动打印二维码" name="automatic_printing_of_QR_code" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" />
<button string="打印二维码" name="automatic_printing_of_QR_code" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印二维码"/>
<button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="组装单打印" name="assemble_single_print" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"/>
<button string="组装单打印" name="assemble_single_print" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印组装单"/>
</header>
<sheet>
<group string="功能刀具信息">
@@ -890,32 +900,32 @@
</group>
<group string="组装物料信息">
<group>
<field name="integral_code"/>
<field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="blade_code"/>
<field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="bar_code"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="pad_code"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="handle_code"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="chuck_code"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_integral_model_ids', '=', [])]}"/>
<field name="integral_code" attrs="{'invisible':[('mrs_cutting_tool_integral_model_ids', '=', [])]}"/>
<field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_blade_model_ids', '=', [])]}"/>
<field name="blade_code" attrs="{'invisible':[('mrs_cutting_tool_blade_model_ids', '=', [])]}"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_cutterbar_model_ids', '=', [])]}"/>
<field name="bar_code" attrs="{'invisible':[('mrs_cutting_tool_cutterbar_model_ids', '=', [])]}"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_cutterpad_model_ids', '=', [])]}"/>
<field name="pad_code" attrs="{'invisible':[('mrs_cutting_tool_cutterpad_model_ids', '=', [])]}"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_cutterhandle_model_ids', '=', [])]}"/>
<field name="handle_code" attrs="{'invisible':[('mrs_cutting_tool_cutterhandle_model_ids', '=', [])]}"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags" attrs="{'invisible':[('mrs_cutting_tool_cutterhead_model_ids', '=', [])]}"/>
<field name="chuck_code" attrs="{'invisible':[('mrs_cutting_tool_cutterhead_model_ids', '=', [])]}"/>
</group>
<group>
<field name="integral_name"/>
<field name="sf_tool_brand_id_1"/>
<field name="blade_name"/>
<field name="sf_tool_brand_id_2"/>
<field name="bar_name"/>
<field name="sf_tool_brand_id_3"/>
<field name="pad_name"/>
<field name="sf_tool_brand_id_4"/>
<field name="handle_name"/>
<field name="sf_tool_brand_id_5"/>
<field name="chuck_name"/>
<field name="sf_tool_brand_id_6"/>
<field name="integral_name" attrs="{'invisible':[('mrs_cutting_tool_integral_model_ids', '=', [])]}"/>
<field name="sf_tool_brand_id_1" attrs="{'invisible':[('mrs_cutting_tool_integral_model_ids', '=', [])]}"/>
<field name="blade_name" attrs="{'invisible':[('mrs_cutting_tool_blade_model_ids', '=', [])]}"/>
<field name="sf_tool_brand_id_2" attrs="{'invisible':[('mrs_cutting_tool_blade_model_ids', '=', [])]}"/>
<field name="bar_name" attrs="{'invisible':[('mrs_cutting_tool_cutterbar_model_ids', '=', [])]}"/>
<field name="sf_tool_brand_id_3" attrs="{'invisible':[('mrs_cutting_tool_cutterbar_model_ids', '=', [])]}"/>
<field name="pad_name" attrs="{'invisible':[('mrs_cutting_tool_cutterpad_model_ids', '=', [])]}"/>
<field name="sf_tool_brand_id_4" attrs="{'invisible':[('mrs_cutting_tool_cutterpad_model_ids', '=', [])]}"/>
<field name="handle_name" attrs="{'invisible':[('mrs_cutting_tool_cutterhandle_model_ids', '=', [])]}"/>
<field name="sf_tool_brand_id_5" attrs="{'invisible':[('mrs_cutting_tool_cutterhandle_model_ids', '=', [])]}"/>
<field name="chuck_name" attrs="{'invisible':[('mrs_cutting_tool_cutterhead_model_ids', '=', [])]}"/>
<field name="sf_tool_brand_id_6" attrs="{'invisible':[('mrs_cutting_tool_cutterhead_model_ids', '=', [])]}"/>
</group>
</group>
<group string="组装参数信息">