1、删除功能刀具组装的取消组装功能和出库功能;2、删除功能刀具组装单的单据来源跳转按钮;3、新增组装单编码字段和自动生成编码的方法;4、新增功能刀具序列号,绑定功能刀具产品序列号;5、完成功能刀具组装后的产品入库到位置【组装后】
This commit is contained in:
@@ -997,10 +997,11 @@
|
||||
<field name="model">sf.functional.tool.assembly</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree create="0">
|
||||
<field name="assembly_order_code"/>
|
||||
<field name="functional_tool_code"/>
|
||||
<field name="name"/>
|
||||
<field name="functional_tool_type_id"/>
|
||||
<field name="loading_task_source" optional="hide"/>
|
||||
<field name="loading_task_source"/>
|
||||
<field name="applicant"/>
|
||||
<field name="assemble_status" optional="hide"/>
|
||||
<field name="use_tool_time" />
|
||||
@@ -1034,13 +1035,8 @@
|
||||
'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" 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')]}" />
|
||||
<button string="组装单打印" name="assemble_single_print" type="object"
|
||||
attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印组装单"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
@@ -1051,7 +1047,7 @@
|
||||
<field name="arch" type="xml">
|
||||
<form create="0">
|
||||
<header>
|
||||
<button string="组装"
|
||||
<button string="组装"
|
||||
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
|
||||
type="action"
|
||||
context="{
|
||||
@@ -1071,22 +1067,11 @@
|
||||
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" confirm="是否确认取消组装"/>
|
||||
|
||||
<button string="打印二维码" name="automatic_printing_of_QR_code" type="object"
|
||||
<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" 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')]}" />
|
||||
<field name="assemble_status" widget="statusbar" statusbar_visible="0,1,2"/>
|
||||
<field name="assemble_status" widget="statusbar" statusbar_visible="0,1,2"/>
|
||||
</header>
|
||||
<sheet>
|
||||
<div class="oe_title">
|
||||
|
||||
Reference in New Issue
Block a user