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

1、删除功能刀具缓存对象，删除出库弹窗对像，删除功能刀具组装、机台换刀申请和CAM换刀的界面跳转按钮，并在form界面添加管理界面字段；2、优化组装单编码的生成；3、将刀具管理下所以功能刀具相关的模型中的功能刀具名称字段改为绑定功能刀具产品对象，编码改为序列号并绑定产品序列号对象，4、优化刀具管理下的功能刀具界面，5、优化从组装申请到组装完成所以流程功能

Browse Source
This commit is contained in:
JIKIMO-YXH\xianghui
2023-10-31 17:45:45 +08:00
parent deccb6e3cd
commit d429a8b4b8
6 changed files with 202 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
sf_tool_management/views/tool_base_views.xml
View File

@@ -7,8 +7,8 @@
<field name="model">sf.functional.cutting.tool.entity</field>
<field name="arch" type="xml">
<tree string="功能刀具列表" create="0" edit="0" delete="0">
<field name="code" />
<field name="name" />
<field name="barcode_id" />
<field name="functional_tool_name_id" />
<field name="mrs_cutting_tool_type_id" />
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
@@ -29,14 +29,13 @@
<sheet>
<div class="oe_title">
<h1>
<field name="name" invisible="False" placeholder="请输入20字以内的名称"/>
<field name="barcode_id" readonly="1" nolabel="True"/>
</h1>
</div>
<group>
<group>
<field name="code" readonly="1" nolabel="True"/>
<field name="functional_tool_name_id" invisible="False" placeholder="请输入20字以内的名称"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id"
options="{'no_create': True, 'no_quick_create': True}"
attrs="{'invisible': [('cutting_tool_blade_model_id', '!=', False)]}"
@@ -149,8 +148,8 @@
<field name="model">sf.functional.cutting.tool.entity</field>
<field name="arch" type="xml">
<search>
<field name="code" />
<field name="name" />
<field name="barcode_id" />
<field name="functional_tool_name_id" />
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
@@ -179,9 +178,9 @@
<field name="model">sf.functional.tool.warning</field>
<field name="arch" type="xml">
<tree string="功能刀具预警" create="0" edit="0" delete="0" >
<field name="code" />
<field name="name" />
<field name="mrs_cutting_tool_type_id" />
<field name="barcode_id" />
<field name="functional_tool_name_id"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
<field name="cutting_tool_cutterbar_model_id" optional="hide"/>
@@ -209,12 +208,12 @@
<sheet>
<div class="oe_title">
<h1>
<field name="name" invisible="False"/>
<field name="barcode_id" readonly="1"/>
</h1>
</div>
<group>
<group>
<field name="code" readonly="1"/>
<field name="functional_tool_name_id" invisible="False"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id"
@@ -299,8 +298,8 @@
<field name="model">sf.functional.tool.warning</field>
<field name="arch" type="xml">
<search string="功能刀具预警">
<field name="code" />
<field name="name" />
<field name="barcode_id" />
<field name="functional_tool_name_id" />
<field name="mrs_cutting_tool_type_id" />
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
@@ -338,10 +337,9 @@
<field name="model">sf.real.time.distribution.of.functional.tools</field>
<field name="arch" type="xml">
<tree create="0" edit="0" delete="0" >
<field name="code"/>
<field name="name"/>
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
<field name="cutting_tool_cutterbar_model_id" optional="hide"/>
@@ -371,12 +369,12 @@
<sheet>
<div class="oe_title">
<h1>
<field name="name" invisible="False"/>
<field name="barcode_id" readonly="1"/>
</h1>
</div>
<group>
<group>
<field name="code" readonly="1"/>
<field name="functional_tool_name_id" invisible="False"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id"
@@ -465,8 +463,8 @@
<field name="model">sf.real.time.distribution.of.functional.tools</field>
<field name="arch" type="xml">
<search>
<field name="code"/>
<field name="name"/>
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
@@ -496,8 +494,8 @@
<field name="model">sf.inbound.and.outbound.records.of.functional.tools</field>
<field name="arch" type="xml">
<tree string="功能刀具出入库记录" create="0" edit="0" delete="0">
<field name="code"/>
<field name="name"/>
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
@@ -521,12 +519,12 @@
<sheet>
<div class="oe_title">
<h1>
<field name="name" invisible="False"/>
<field name="barcode_id" readonly="1"/>
</h1>
</div>
<group>
<group>
<field name="code" readonly="1"/>
<field name="functional_tool_name_id" invisible="False"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id"
@@ -608,8 +606,8 @@
<field name="model">sf.inbound.and.outbound.records.of.functional.tools</field>
<field name="arch" type="xml">
<search>
<field name="code"/>
<field name="name"/>
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="cutting_tool_integral_model_id" optional="hide"/>
<field name="cutting_tool_blade_model_id" optional="hide"/>
@@ -700,9 +698,9 @@
<field name="machine_tool_code" invisible="1"/>
<field name="machine_table_type_id"/>
<field name="cutter_spacing_code"/>
<field name="functional_tool_code"/>
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="replacement_tool_code"/>
<!-- <field name="replacement_tool_code"/>-->
<field name="replacement_tool_name_id"/>
<field name="applicant"/>
@@ -714,11 +712,10 @@
type="action"
context="{ 'default_name':name,
'default_machine_tool_code': machine_tool_code,
'default_functional_tool_code': functional_tool_code,
'default_barcode_id': barcode_id,
'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,
'default_replacement_tool_type_id': functional_tool_type_id,
'default_replacement_tool_coarse_middle_thin': coarse_middle_thin}"
@@ -731,15 +728,13 @@
context="{ 'default_CNC_machine_table_id':name,
'default_machine_tool_code': machine_tool_code,
'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_code': functional_tool_code,
'default_barcode_id': barcode_id,
'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="查看组装单" 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_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>
@@ -756,11 +751,10 @@
type="action"
context="{ 'default_name':name,
'default_machine_tool_code': machine_tool_code,
'default_functional_tool_code': functional_tool_code,
'default_barcode_id': barcode_id,
'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,
'default_replacement_tool_type_id': functional_tool_type_id,
'default_replacement_tool_coarse_middle_thin': coarse_middle_thin}"
@@ -773,13 +767,11 @@
context="{ 'default_CNC_machine_table_id':name,
'default_machine_tool_code': machine_tool_code,
'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_code': functional_tool_code,
'default_barcode_id': barcode_id,
'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="查看组装单" 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>
@@ -791,10 +783,13 @@
</div>
<group>
<group>
<field name="machine_table_type_id"/>
<field name="machine_tool_code" invisible="True"/>
<field name="machine_table_type_id"/>
<field name="cutter_spacing_code"/>
<field name="functional_tool_code"/>
<field name="sf_functional_tool_assembly_id" string="组装单"/>
</group>
<group>
<field name="barcode_id"/>
<field name="functional_tool_name_id" placeholder="请选择"/>
<field name="functional_tool_type_id"/>
</group>
@@ -810,7 +805,7 @@
<field name="status" invisible="True"/>
</group>
<group>
<field name="replacement_tool_code"/>
<!-- <field name="replacement_tool_code"/>-->
<field name="used_tool_time"/>
<field name="new_former"/>
<field name="reason_for_applying" />
@@ -854,9 +849,9 @@
<field name="machine_tool_code" invisible="1"/>
<field name="machine_table_type_id"/>
<field name="cutter_spacing_code"/>
<field name="functional_tool_code"/>
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="replacement_tool_code"/>
<!-- <field name="replacement_tool_code"/>-->
<field name="replacement_tool_name_id"/>
<field name="applicant"/>
<searchpanel>
@@ -892,8 +887,6 @@
<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>
@@ -906,8 +899,6 @@
<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="是否确认撤回装刀"/>
<field name="plan_execute_status" widget="statusbar" statusbar_visible="0,1,2"/>
</header>
@@ -923,12 +914,13 @@
<field name="cam_procedure_code"/>
<field name="cam_cutter_spacing_code"/>
<field name="machine_table_name_id" placeholder="请选择"/>
<field name="machine_tool_cutter_spacing_code"/>
<field name="sf_functional_tool_assembly_id" string="组装单"/>
</group>
<group>
<field name="functional_tool_code"/>
<field name="barcode_id"/>
<field name="functional_tool_name_id" placeholder="请选择"/>
<field name="functional_tool_type_id" placeholder="请选择"/>
<field name="machine_tool_cutter_spacing_code"/>
</group>
</group>
<notebook>
@@ -998,8 +990,9 @@
<field name="arch" type="xml">
<tree create="0">
<field name="assembly_order_code"/>
<field name="functional_tool_code"/>
<field name="name"/>
<field name="barcode_id" optional="hide"/>
<!-- <field name="functional_tool_code" invisible="1"/>-->
<field name="functional_tool_name_id"/>
<field name="functional_tool_type_id"/>
<field name="loading_task_source"/>
<field name="applicant"/>
@@ -1022,9 +1015,9 @@
context="{
'default_machine_tool_name_id': machine_tool_name_id,
'default_machine_tool_code': machine_tool_code,
'default_code': functional_tool_code,
'default_barcode_id': barcode_id,
'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_name_id': name,
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id,
'default_functional_tool_length': functional_tool_length,
'default_effective_length': None,
@@ -1053,9 +1046,9 @@
context="{
'default_machine_tool_name_id': machine_tool_name_id,
'default_machine_tool_code': machine_tool_code,
'default_code': functional_tool_code,
'default_barcode_id': barcode_id,
'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_name_id': name,
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id,
'default_functional_tool_length': functional_tool_length,
'default_effective_length': None,
@@ -1076,19 +1069,24 @@
<sheet>
<div class="oe_title">
<h1>
<field name="name"/>
<field name="assembly_order_code"/>
</h1>
</div>
<group>
<group>
<field name="functional_tool_code" readonly="1"/>
<field name="barcode_id"/>
<field name="functional_tool_name_id"/>
<field name="functional_tool_type_id"/>
<field name="functional_tool_diameter"/>
<field name="functional_tool_length"/>
<field name="functional_tool_cutting_type"/>
<!-- <field name="barcode"/>-->
<!-- <field name="barcode_image"/>-->
<field name="sf_machine_table_tool_changing_apply_id"
attrs="{'invisible': [('sf_machine_table_tool_changing_apply_id','=',False)]}"/>
<field name="sf_cam_work_order_program_knife_plan_id"
attrs="{'invisible': [('sf_cam_work_order_program_knife_plan_id','=',False)]}"/>
</group>
<group>
<field name="functional_tool_diameter"/>
<field name="functional_tool_length"/>
<field name="functional_tool_cutting_type"/>
</group>
</group>
<notebook>
@@ -1242,8 +1240,10 @@
<field name="model">sf.functional.tool.assembly</field>
<field name="arch" type="xml">
<search>
<field name="functional_tool_code"/>
<field name="name"/>
<!-- <field name="functional_tool_code"/>-->
<field name="functional_tool_name_id"/>
<field name="assembly_order_code"/>
<field name="barcode_id"/>
<field name="functional_tool_type_id"/>
<field name="loading_task_source"/>
<field name="applicant"/>