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

1、刀具组和刀具管理模块下的所以模型添加active字段，添加已归档搜索方式；2、解决俩个警告；3、产品模型的刀具物料、型号、规格字段添加当产品物料为刀具时必填及红星样式；4、关闭刀具物料查询模型和CAM用刀模型的创建按钮；

Browse Source
This commit is contained in:
yuxianghui
2024-02-29 14:48:21 +08:00
parent 17b167f1de
commit 3c569fd485
7 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sf_tool_management/views/tool_base_views.xml
View File

@@ -200,6 +200,7 @@
<field name="current_location_id" invisible="True"/>
<field name="sf_cutting_tool_type_id" invisible="True"/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
<searchpanel>
<field name="sf_cutting_tool_type_id" icon="fa-building" enable_counters="1"/>
<field name="current_location_id" icon="fa-building" enable_counters="1"/>
@@ -269,6 +270,7 @@
<field name="dispose_time"/>
<field name="dispose_func"/>
<field name="production_line_id" invisible="True"/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
<searchpanel>
<field name="production_line_id" icon="fa-building" enable_counters="1"/>
<field name="maintenance_equipment_id" icon="fa-building" enable_counters="1"/>
@@ -417,6 +419,7 @@
<field name="max_stock_num"/>
<field name="batch_replenishment_num"/>
<field name="unit"/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
<searchpanel>
<field name="sf_cutting_tool_type_id" enable_counters="1" icon="fa-building"/>
</searchpanel>
@@ -749,6 +752,7 @@
<field name="used_value"/>
<field name="functional_tool_status"/>
<field name="applicant" optional="hide"/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
<searchpanel>
<field name="production_line_id" enable_counters="1" icon="fa-building"/>
<field name="maintenance_equipment_id" enable_counters="1" icon="fa-building"/>
@@ -772,7 +776,7 @@
<field name="name">CAM工单程序用刀计划</field>
<field name="model">sf.cam.work.order.program.knife.plan</field>
<field name="arch" type="xml">
<tree>
<tree create="0">
<field name="name" string="工单编码"/>
<field name="cam_procedure_code"/>
<field name="filename"/>
@@ -806,7 +810,7 @@
<field name="name">CAM工单程序用刀计划</field>
<field name="model">sf.cam.work.order.program.knife.plan</field>
<field name="arch" type="xml">
<form>
<form create="0">
<header>
<button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary"
attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
@@ -894,6 +898,7 @@
<field name="need_knife_time"/>
<field name="applicant_time"/>
<field name="plan_execute_status"/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
<searchpanel>
<field name="production_line_id" string="生产线" enable_counters="1" icon="fa-filter"/>
<field name="functional_tool_type_id" string="功能刀具类型" enable_counters="1"
@@ -1238,6 +1243,8 @@
<field name="functional_tool_type_id"/>
<filter name="no_assemble_status" string="未组装" domain="[('assemble_status', '=', '0')]"/>
<filter name="yes_assemble_status" string="已组装" domain="[('assemble_status', '=', '1')]"/>
<separator/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
<searchpanel>
<field name="functional_tool_type_id" enable_counters="1" icon="fa-filter"/>
<!-- <field name="assemble_status" enable_counters="1" icon="fa-filter"/>-->

5
sf_tool_management/views/tool_material_search.xml
View File

@@ -5,7 +5,7 @@
<field name="name">sf.tool.material.search.tree</field>
<field name="model">sf.tool.material.search</field>
<field name="arch" type="xml">
<tree string="刀具物料查询">
<tree string="刀具物料查询" create="0">
<field name="name"/>
<field name="cutting_tool_material_id"/>
<field name="cutting_tool_standard_library_id"/>
@@ -21,7 +21,7 @@
<field name="name">sf.tool.material.search.form</field>
<field name="model">sf.tool.material.search</field>
<field name="arch" type="xml">
<form string="刀具物料查询">
<form string="刀具物料查询" create="0">
<sheet>
<div class="oe_title">
<h1>
@@ -78,6 +78,7 @@
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="cutting_tool_standard_library_id" string="刀具型号搜索"/>
<field name="specification_id" string="规格搜索"/>
<filter string="已归档" name="inactive" domain="[('active', '=', False)]"/>
<searchpanel>
<field name="cutting_tool_material_id" icon="fa-building" enable_counters="1"/>
</searchpanel>