优化装夹工单，新增工件装夹page，名字为组件的page名称改为物料，去掉单独的工件装夹功能
This commit is contained in:
jinling.yang
@@ -20,7 +20,6 @@
|
||||
'views/functional_fixture_view.xml',
|
||||
'wizard/workpiece_clamping_wizard_view.xml',
|
||||
'wizard/stock_removal_wizard_view.xml',
|
||||
'views/assemble_view.xml',
|
||||
'views/menu_view.xml',
|
||||
"views/tool_views.xml",
|
||||
"views/tool_menu.xml",
|
||||
|
||||
@@ -3,7 +3,6 @@ from . import common
|
||||
from . import tool_base_new
|
||||
from . import fixture
|
||||
from . import functional_fixture
|
||||
from . import assemble
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
from odoo import models, fields, api
|
||||
|
||||
|
||||
class Assemble(models.Model):
|
||||
_name = 'sf.assemble'
|
||||
_description = "组合装夹"
|
||||
|
||||
functional_fixture_code = fields.Char(string="功能夹具编码", readonly=True)
|
||||
name = fields.Char(string="功能夹具名称", readonly=True)
|
||||
functional_fixture_type_id = fields.Many2one('sf.functional.fixture.type', string="功能夹具类型", readonly=True)
|
||||
chuck_name = fields.Char(string="卡盘名称")
|
||||
chuck_brand_id = fields.Many2one('sf.machine.brand', string="卡盘品牌")
|
||||
chuck_type_id = fields.Char(string="卡盘类型")
|
||||
chuck_model_id = fields.Char(string="卡盘型号")
|
||||
tray_name = fields.Char(string="托盘名称")
|
||||
tray_brand_id = fields.Many2one('sf.machine.brand', string="托盘品牌")
|
||||
tray_type_id = fields.Char(string="托盘类型")
|
||||
tray_model_id = fields.Char(string="托盘型号")
|
||||
real_code = fields.Char(string="真实坯料编码")
|
||||
real_name = fields.Char(string="真实坯料名称")
|
||||
real_width = fields.Float(string="真实宽度")
|
||||
real_length = fields.Float(string="真实长度")
|
||||
real_height = fields.Float(string="真实高度")
|
||||
real_diameter = fields.Float(string="真实直径")
|
||||
total_wight = fields.Float(string="总重量")
|
||||
maximum_carrying_weight = fields.Char(string="最大承载重量[kg]")
|
||||
maximum_clamping_force = fields.Char(string="最大夹持力[n]")
|
||||
production_line = fields.Char(string="生产线")
|
||||
# 以下为智能工厂工单带过来的机床信息
|
||||
machine_tool = fields.Many2one('sf.machine_tool', string="机床名称")
|
||||
machine_tool_startime = fields.Date(string="机床开始加工时间")
|
||||
# 以下为智能工厂工单带过来的信息
|
||||
apply_staff = fields.Char(string="申请人")
|
||||
machine_tool_code = fields.Char(string="机床编码")
|
||||
apply_time = fields.Date(string="申请时间")
|
||||
apply_reason = fields.Char(string="申请原因")
|
||||
# 以下为装夹的信息
|
||||
preset_staff = fields.Char(string="预调名称")
|
||||
preset_time = fields.Date(string="预调时间")
|
||||
material_taker = fields.Char(string="领料人")
|
||||
material_removal_time = fields.Date(string="领料出库时间")
|
||||
remark = fields.Char(string="备注")
|
||||
# 以下为出库的信息
|
||||
stock_removal_code = fields.Char(string="出库人")
|
||||
@@ -16,7 +16,7 @@ class FunctionalFixture(models.Model):
|
||||
|
||||
code = fields.Char(string='编码', readonly=True)
|
||||
name = fields.Char(string="名称", size=15, required=True)
|
||||
functional_fixture_type_id = fields.Many2one('sf.functional.fixture.type', string="功能夹具类型", required=True)
|
||||
type_id = fields.Many2one('sf.functional.fixture.type', string="功能夹具类型", required=True)
|
||||
zero_chuck_model_ids = fields.Many2many('sf.fixture.model', 'rel_fixture_model_zero_chuck', string="零点卡盘型号",
|
||||
required=True,
|
||||
domain=[('fixture_material_type', '=', '零点卡盘')])
|
||||
|
||||
@@ -26,7 +26,6 @@ access_sf_functional_fixture_type,sf_functional_fixture_type,model_sf_functional
|
||||
access_sf_functional_fixture,sf_functional_fixture,model_sf_functional_fixture,base.group_user,1,1,1,1
|
||||
access_sf_workpiece_clamping_wizard,sf_workpiece_clamping_wizard,model_sf_workpiece_clamping_wizard,base.group_user,1,1,1,1
|
||||
access_sf_stock_removal_wizard,sf_stock_removal_wizard,model_sf_stock_removal_wizard,base.group_user,1,1,1,1
|
||||
access_sf_assemble,sf_assemble,model_sf_assemble,base.group_user,1,1,1,1
|
||||
|
||||
|
||||
|
||||
|
||||
|
@@ -1,131 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<odoo>
|
||||
|
||||
<!-- ===========================工件夹具====================================-->
|
||||
|
||||
<record model="ir.ui.view" id="search_sf_assemble_view">
|
||||
<field name="name">search.sf.assemble</field>
|
||||
<field name="model">sf.assemble</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="工件夹具">
|
||||
<field name="functional_fixture_code" string="编码"
|
||||
filter_domain="[('functional_fixture_code', 'ilike', self)]"/>
|
||||
<field name="name" string="名称"
|
||||
filter_domain="[('name', 'ilike', self)]"/>
|
||||
<!-- <field name="material_id" string="材质"-->
|
||||
<!-- filter_domain="[('material_id.name', 'ilike', self)]"/>-->
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="sf_assemble_view_tree" model="ir.ui.view">
|
||||
<field name="name">工件夹具</field>
|
||||
<field name="model">sf.assemble</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="工件夹具">
|
||||
<field name="functional_fixture_code"/>
|
||||
<field name="name"/>
|
||||
<field name="functional_fixture_type_id"/>
|
||||
<field name="chuck_type_id"/>
|
||||
<field name="chuck_name"/>
|
||||
<field name="chuck_brand_id"/>
|
||||
<field name="chuck_model_id"/>
|
||||
<field name="tray_type_id"/>
|
||||
<field name="tray_name"/>
|
||||
<field name="tray_brand_id"/>
|
||||
<field name="tray_model_id"/>
|
||||
<field name="maximum_carrying_weight"/>
|
||||
<field name="maximum_clamping_force"/>
|
||||
<field name="production_line"/>
|
||||
<field name="machine_tool"/>
|
||||
<field name="machine_tool_code"/>
|
||||
<field name="apply_staff"/>
|
||||
<field name="apply_time"/>
|
||||
<field name="apply_reason"/>
|
||||
<field name="preset_staff"/>
|
||||
<field name="preset_time"/>
|
||||
<field name="material_taker"/>
|
||||
<field name="material_removal_time"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="sf_assemble_view_form" model="ir.ui.view">
|
||||
<field name="name">工件夹具</field>
|
||||
<field name="model">sf.assemble</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="工件夹具">
|
||||
<header>
|
||||
<button type="action" name="%(action_workpiece_clamping_wizard)d" class="btn btn-info"
|
||||
string="装夹"/>
|
||||
<button type="action" name="%(action_stock_removal_wizard)d" class="btn btn-info"
|
||||
string="出库"/>
|
||||
</header>
|
||||
<sheet>
|
||||
<group string="基本信息">
|
||||
<group>
|
||||
<field name="functional_fixture_code"/>
|
||||
<field name="functional_fixture_type_id"/>
|
||||
<field name="remark"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
</group>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="装夹" name="clamping" attrs="{'invisible': [('chuck_type_id', '=', False)]}">
|
||||
<group>
|
||||
<group string="卡盘">
|
||||
<field name="chuck_type_id"></field>
|
||||
<field name="chuck_name"></field>
|
||||
<field name="chuck_brand_id"></field>
|
||||
<field name="chuck_model_id"></field>
|
||||
</group>
|
||||
<group string="托盘">
|
||||
<field name="tray_type_id"></field>
|
||||
<field name="tray_name"></field>
|
||||
<field name="tray_brand_id"></field>
|
||||
<field name="tray_model_id"></field>
|
||||
</group>
|
||||
<group string="坯料">
|
||||
<field name="real_code" string="坯料编码"></field>
|
||||
<field name="real_name" string="坯料名称"></field>
|
||||
<label for="real_length" string="尺寸[mm]"/>
|
||||
<div class="o_address_format">
|
||||
<label for="real_length" string="长"/>
|
||||
<field name="real_length" class="o_address_zip"
|
||||
options="{'format': false}"/>
|
||||
<span>&nbsp;</span>
|
||||
<label for="real_width" string="宽"/>
|
||||
<field name="real_width" class="o_address_zip"
|
||||
options="{'format': false}"/>
|
||||
<span>&nbsp;</span>
|
||||
<label for="real_height" string="高"/>
|
||||
<field name="real_height" class="o_address_zip"
|
||||
options="{'format': false}"/>
|
||||
</div>
|
||||
<field name="real_diameter" string="直径[mm]"></field>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="出库" name="stock_removal"
|
||||
attrs="{'invisible': [('production_line', '=', False)]}">
|
||||
<group>
|
||||
<field name="production_line"></field>
|
||||
<field name="machine_tool" string="机台"></field>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="sf_assemble_view_act" model="ir.actions.act_window">
|
||||
<field name="name">工件夹具</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">sf.assemble</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -82,7 +82,7 @@
|
||||
<tree string="功能夹具">
|
||||
<field name="code"/>
|
||||
<field name="name"/>
|
||||
<field name="functional_fixture_type_id"/>
|
||||
<field name="type_id"/>
|
||||
<field name="zero_chuck_model_ids" widget="many2many_tags"/>
|
||||
</tree>
|
||||
</field>
|
||||
@@ -98,7 +98,7 @@
|
||||
<group>
|
||||
<field name="code" force_save="1"/>
|
||||
<field name="name"/>
|
||||
<field name="functional_fixture_type_id"/>
|
||||
<field name="type_id"/>
|
||||
<field name="zero_chuck_model_ids" widget="many2many_tags"/>
|
||||
<field name="transfer_tray_model_ids" widget="many2many_tags"/>
|
||||
<field name="pneumatic_tray_model_ids" widget="many2many_tags"/>
|
||||
|
||||
@@ -38,11 +38,4 @@
|
||||
name="功能夹具"
|
||||
sequence="4"
|
||||
/>
|
||||
|
||||
<menuitem id="menu_sf_assemble"
|
||||
parent="menu_sf_fixture"
|
||||
action="sf_assemble_view_act"
|
||||
name="工件装夹"
|
||||
sequence="5"
|
||||
/>
|
||||
</odoo>
|
||||
Reference in New Issue
Block a user