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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹

Browse Source
This commit is contained in:
jinling.yang
2023-07-06 17:33:47 +08:00
parent 66cd682f7d f31becc215
commit 1a0fa3fdb0
33 changed files with 1133 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
sf_base/models/assemble.py
View File

@@ -5,50 +5,40 @@ class Assemble(models.Model):
_name = 'sf.assemble'
_description = "组合装夹"
functional_fixture_code = fields.Char(string="功能夹具编码", size=25, required=True)
functional_fixture_name = fields.Char(string="功能夹具名称", size=25, required=True)
functional_fixture_type = fields.Char(string="功能夹具类型", required=True)
chuck_name = fields.Char(string="卡盘名称", required=True)
chuck_brand_id = fields.Many2one('sf.machine.brand', string="卡盘品牌", required=True)
chuck_type_id = fields.Char(string="卡盘类型", required=True)
chuck_model_id = fields.Char(string="卡盘型号", required=True)
tray_name = fields.Char(string="托盘名称", required=True)
tray_brand_id = fields.Many2one('sf.machine.brand', string="托盘品牌", required=True)
tray_type_id = fields.Char(string="托盘类型", required=True)
tray_model_id = fields.Char(string="托盘型号", required=True)
real_code = fields.Char(string="真实坯料编码", size=25, required=True)
real_name = fields.Char(string="真实坯料名称", size=25, required=True)
total_wight = fields.Float(string="总重量", required=True)
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="生产线", required=True)
production_line = fields.Char(string="生产线")
# 以下为智能工厂工单带过来的机床信息
machine_tool = fields.Many2one('sf.machine_tool', string="机床名称", required=True)
machine_tool_startime = fields.Date(string="机床开始加工时间", required=True)
machine_tool = fields.Many2one('sf.machine_tool', string="机床名称")
machine_tool_startime = fields.Date(string="机床开始加工时间")
# 以下为智能工厂工单带过来的信息
apply_staff = fields.Char(string="申请人", required=True)
machine_tool_code = fields.Char(string="机床编码", required=True)
apply_time = fields.Date(string="申请时间", required=True)
apply_reason = fields.Char(string="申请原因", required=True)
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="预调名称", required=True)
preset_time = fields.Date(string="预调时间", required=True)
material_taker = fields.Char(string="领料人", required=True)
material_removal_time = fields.Date(string="领料出库时间", required=True)
remark = fields.Char(string="备注", required=True)
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="出库人")

134
sf_base/views/assemble_view.xml
View File

@@ -10,8 +10,8 @@
<search string="工件夹具">
<field name="functional_fixture_code" string="编码"
filter_domain="[('functional_fixture_code', 'ilike', self)]"/>
<field name="functional_fixture_name" string="名称"
filter_domain="[('functional_fixture_name', 'ilike', self)]"/>
<field name="name" string="名称"
filter_domain="[('name', 'ilike', self)]"/>
<!-- <field name="material_id" string="材质"-->
<!-- filter_domain="[('material_id.name', 'ilike', self)]"/>-->
</search>
@@ -24,8 +24,8 @@
<field name="arch" type="xml">
<tree string="工件夹具">
<field name="functional_fixture_code"/>
<field name="functional_fixture_name"/>
<field name="functional_fixture_type"/>
<field name="name"/>
<field name="functional_fixture_type_id"/>
<field name="chuck_type_id"/>
<field name="chuck_name"/>
<field name="chuck_brand_id"/>
@@ -65,87 +65,57 @@
<group string="基本信息">
<group>
<field name="functional_fixture_code"/>
</group>
<group>
<field name="functional_fixture_type"/>
</group>
</group>
<!-- <group string="坯料（工件）申请信息">-->
<!-- <group>-->
<!-- <field name="functional_fixture_code"/>-->
<!-- <field name="functional_fixture_type"/>-->
<!--&lt;!&ndash; <field name="surface_accuracy"/>&ndash;&gt;-->
<!-- </group>-->
<!-- <group>-->
<!-- <field name="functional_fixture_name"/>-->
<!-- <label for="apply_length" string="尺寸[mm]"-->
<!-- />-->
<!-- <div class="o_address_format"-->
<!-- >-->
<!-- <label for="apply_length" string="长"/>-->
<!-- <field name="apply_length" class="o_address_zip"-->
<!-- options="{'format': false}"-->
<!-- />-->
<!-- <span>&amp;nbsp;</span>-->
<!-- <label for="apply_width" string="宽"/>-->
<!-- <field name="apply_width" class="o_address_zip"-->
<!-- options="{'format': false}"-->
<!-- />-->
<!-- <span>&amp;nbsp;</span>-->
<!-- <label for="apply_height" string="高"/>-->
<!-- <field name="apply_height" class="o_address_zip"-->
<!-- options="{'format': false}"-->
<!-- />-->
<!-- </div>-->
<!-- <field name="apply_weight"/>-->
<!-- <field name="apply_diameter"/>-->
<!-- </group>-->
<!-- </group>-->
<group string="坯料（工件）装夹信息">
<group string="卡盘">
<field name="chuck_name"/>
<field name="chuck_brand_id"/>
<field name="chuck_type_id"/>
<field name="chuck_model_id"/>
</group>
<group string="托盘">
<field name="tray_name"/>
<field name="tray_brand_id"/>
<field name="tray_type_id"/>
<field name="tray_model_id"/>
</group>
<group>
<field name="real_code"/>
<field name="real_name"/>
<!-- <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>&amp;nbsp;</span>-->
<!-- <label for="real_width" string="宽"/>-->
<!-- <field name="real_width" class="o_address_zip"-->
<!-- options="{'format': false}"-->
<!-- />-->
<!-- <span>&amp;nbsp;</span>-->
<!-- <label for="real_height" string="高"/>-->
<!-- <field name="real_height" class="o_address_zip"-->
<!-- options="{'format': false}"-->
<!-- />-->
<!-- </div>-->
<!-- <field name="real_diameter"/>-->
</group>
</group>
<group string="其他">
<group>
<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>&amp;nbsp;</span>
<label for="real_width" string="宽"/>
<field name="real_width" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;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>

30
sf_base/wizard/stock_removal_wizard_view.xml
View File

@@ -4,22 +4,24 @@
<field name="name">sf.stock.removal.wizard.form.view</field>
<field name="model">sf.stock.removal.wizard</field>
<field name="arch" type="xml">
<form string="出库">
<group>
<form string="装夹">
<sheet>
<group>
<field name="code" string="编码"></field>
<field name="type" string="类型"></field>
<field name="machine_tool" string="类型"></field>
<group>
<field name="code" string="功能夹具编码"></field>
<field name="type" string="类型"></field>
<field name="machine_tool" string="机台"></field>
</group>
<group>
<field name="name" string="功能夹具名称"></field>
<field name="production_line"></field>
</group>
</group>
<group>
<field name="name" string="名称"></field>
<field name="production_line" string="类型"></field>
</group>
</group>
<footer>
<button string="确定" name="submit" type="object" class="oe_highlight"/>
<button string="取消" class="btn btn-secondary" special="cancel"/>
</footer>
<footer>
<button string="确定" name="submit" type="object" class="oe_highlight"/>
<button string="取消" class="btn btn-secondary" special="cancel"/>
</footer>
</sheet>
</form>
</field>
</record>

126
sf_base/wizard/workpiece_clamping_wizard_view.xml
View File

@@ -5,70 +5,74 @@
<field name="model">sf.workpiece.clamping.wizard</field>
<field name="arch" type="xml">
<form string="装夹">
<group string="坯料（工件）申请信息">
<group>
<field name="apply_code" string="编码"></field>
<field name="material_id" string="材质"></field>
<sheet>
<group string="坯料（工件）申请信息">
<group>
<field name="apply_code" string="坯料编码"></field>
<field name="material_id" string="坯料材质"></field>
</group>
<group>
<field name="apply_name" string="坯料名称"></field>
<label for="apply_length" string="尺寸[mm]"/>
<div class="o_address_format">
<label for="apply_length" string="长"/>
<field name="apply_length" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="apply_width" string="宽"/>
<field name="apply_width" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="apply_height" string="高"/>
<field name="apply_height" class="o_address_zip"
options="{'format': false}"/>
</div>
<field name="apply_diameter" string="直径[mm]"></field>
</group>
</group>
<group string="坯料（工件）装夹信息">
<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>&amp;nbsp;</span>
<label for="real_width" string="宽"/>
<field name="real_width" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;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>
<group>
<field name="apply_name" string="名称"></field>
<label for="apply_length" string="尺寸[mm]"/>
<div class="o_address_format">
<label for="apply_length" string="长"/>
<field name="apply_length" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="apply_width" string="宽"/>
<field name="apply_width" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="apply_height" string="高"/>
<field name="apply_height" class="o_address_zip"
options="{'format': false}"/>
</div>
<field name="apply_diameter" string="直径"></field>
<group>
<field name="preset_program_information"></field>
</group>
</group>
</group>
<group string="坯料（工件）装夹信息">
<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"></field>
<field name="real_name"></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>&amp;nbsp;</span>
<label for="real_width" string="宽"/>
<field name="real_width" class="o_address_zip"
options="{'format': false}"/>
<span>&amp;nbsp;</span>
<label for="real_height" string="高"/>
<field name="real_height" class="o_address_zip"
options="{'format': false}"/>
</div>
<field name="real_diameter" string="直径"></field>
</group>
<group>
<field name="preset_program_information"></field>
</group>
</group>
<footer>
<button string="确定" name="submit" type="object" class="oe_highlight"/>
<button string="取消" class="btn btn-secondary" special="cancel"/>
</footer>
<footer>
<button string="确定" name="submit" type="object" class="oe_highlight"/>
<button string="取消" class="btn btn-secondary" special="cancel"/>
</footer>
</sheet>
</form>
</field>
</record>