新增功能刀具组装界面和CAM工单程序用刀计划界面、机床换刀申请界面相互跳转功能按钮；功能刀具预警新增展示分组展示全部CNC机床，功能刀具实时分布修改数量相关字段类型为Integer，并新增自动计算合计数和总数功能
This commit is contained in:
yuxianghui
@@ -235,7 +235,7 @@
|
||||
<field name="dispose_func" optional="show"/>
|
||||
<field name="remark" optional="show"/>
|
||||
<searchpanel>
|
||||
<field name="mrs_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
|
||||
<field name="machine_table_name_id" string="CNC机床列表" icon="fa-building" enable_counters="1"/>
|
||||
</searchpanel>
|
||||
</search>
|
||||
</field>
|
||||
@@ -313,17 +313,34 @@
|
||||
<page string="实时分布信息">
|
||||
<group>
|
||||
<group>
|
||||
<field name="tool_stock_num"/>
|
||||
<field name="side_shelf_num"/>
|
||||
<field name="on_tool_stock_num"/>
|
||||
<field name="tool_stock_total"/>
|
||||
<group>
|
||||
<field name="tool_stock_num"/>
|
||||
<field name="return_reuse_num_re"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="side_shelf_num"/>
|
||||
<field name="return_reuse_num_co"/>
|
||||
</group>
|
||||
<!-- <field name="tool_stock_num"/>-->
|
||||
<!-- <field name="side_shelf_num"/>-->
|
||||
<!-- <field name="on_tool_stock_num"/>-->
|
||||
<!-- <field name="tool_stock_total"/>-->
|
||||
</group>
|
||||
<group>
|
||||
<field name="return_reuse_num_re"/>
|
||||
<field name="return_reuse_num_co"/>
|
||||
<field name="return_processing_num"/>
|
||||
<field name="return_total"/>
|
||||
<field name="total"/>
|
||||
<group>
|
||||
<field name="on_tool_stock_num"/>
|
||||
<field name="return_processing_num"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="tool_stock_total"/>
|
||||
<field name="return_total"/>
|
||||
<field name="total"/>
|
||||
</group>
|
||||
<!-- <field name="return_reuse_num_re"/>-->
|
||||
<!-- <field name="return_reuse_num_co"/>-->
|
||||
<!-- <field name="return_processing_num"/>-->
|
||||
<!-- <field name="return_total"/>-->
|
||||
<!-- <field name="total"/>-->
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
@@ -551,6 +568,7 @@
|
||||
type="action"
|
||||
context="{ 'default_name':name,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'default_functional_tool_code': functional_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,
|
||||
@@ -573,6 +591,8 @@
|
||||
class="btn-primary"
|
||||
attrs="{'invisible': [('status', '!=', '0')]}"
|
||||
/>
|
||||
<button string="查看组装单" type="object" name="open_sf_functional_tool_assembly"
|
||||
class="oe_highlight" attrs="{'invisible': [('status', '!=', '1')]}"/>
|
||||
<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>
|
||||
@@ -590,6 +610,7 @@
|
||||
type="action"
|
||||
context="{ 'default_name':name,
|
||||
'default_machine_tool_code': machine_tool_code,
|
||||
'default_functional_tool_code': functional_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,
|
||||
@@ -610,11 +631,12 @@
|
||||
'default_functional_tool_name_id': functional_tool_name_id,
|
||||
'default_functional_tool_type_id': functional_tool_type_id}"
|
||||
class="btn-primary"
|
||||
attrs="{'invisible': [('status', '!=', '0')]}"
|
||||
/>
|
||||
<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>
|
||||
attrs="{'invisible': [('status', '!=', '0')]}"/>
|
||||
<button string="查看组装单" type="object" name="open_sf_functional_tool_assembly"
|
||||
class="oe_highlight" attrs="{'invisible': [('status', '!=', '1')]}"/>
|
||||
<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="基础信息">
|
||||
<group>
|
||||
@@ -685,11 +707,6 @@
|
||||
<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>
|
||||
|
||||
@@ -719,6 +736,8 @@
|
||||
<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="查看组装单" type="object" name="open_sf_functional_tool_assembly"
|
||||
class="oe_highlight" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
|
||||
<button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
|
||||
</tree>
|
||||
</field>
|
||||
@@ -731,6 +750,8 @@
|
||||
<form>
|
||||
<header>
|
||||
<button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
|
||||
<button string="查看组装单" type="object" name="open_sf_functional_tool_assembly"
|
||||
class="oe_highlight" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
|
||||
<button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
|
||||
</header>
|
||||
|
||||
@@ -848,6 +869,10 @@
|
||||
<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="是否确认打印组装单"/>
|
||||
<button string="查看CAM工单程序用刀计划" type="object" name="open_sf_cam_work_order_program_knife_plan"
|
||||
class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '0')]}" />
|
||||
<button string="查看机床换刀申请" type="object" name="open_sf_machine_table_tool_changing_apply"
|
||||
class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '1')]}" />
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
@@ -881,9 +906,13 @@
|
||||
|
||||
<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="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="是否确认打印组装单"/>
|
||||
<button string="组装单打印" name="assemble_single_print" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印组装单"/>
|
||||
<button string="查看CAM工单程序用刀计划" type="object" name="open_sf_cam_work_order_program_knife_plan"
|
||||
class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '0')]}" />
|
||||
<button string="查看机床换刀申请" type="object" name="open_sf_machine_table_tool_changing_apply"
|
||||
class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '1')]}" />
|
||||
</header>
|
||||
<sheet>
|
||||
<group string="功能刀具信息">
|
||||
|
||||
Reference in New Issue
Block a user