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

cnc对象修改

Browse Source
This commit is contained in:
jinling.yang
2022-11-28 12:21:39 +08:00
parent b9212eec90
commit d6321bcb26
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_manufacturing/models/mrp_workorder.py
View File

@@ -310,7 +310,8 @@ class CNCprocessing(models.Model):
depth_of_processing_z = fields.Char('加工深度(Z)') depth_of_processing_z = fields.Char('加工深度(Z)')
cutting_tool_extension_length = fields.Char('刀具伸出长度') cutting_tool_extension_length = fields.Char('刀具伸出长度')
cutting_tool_handle_type = fields.Char('刀柄型号') cutting_tool_handle_type = fields.Char('刀柄型号')
estimated_processing_time = fields.Datetime('预计加工时间') estimated_processing_time = fields.Char('预计加工时间')
remark = fields.Text('备注')
workorder_id = fields.Many2one('mrp.workorder', string="工单") workorder_id = fields.Many2one('mrp.workorder', string="工单")
# mrs下发编程单创建CNC加工 # mrs下发编程单创建CNC加工
@@ -330,5 +331,6 @@ class CNCprocessing(models.Model):
'depth_of_processing_z': obj['depth_of_processing_z'], 'depth_of_processing_z': obj['depth_of_processing_z'],
'cutting_tool_extension_length': obj['cutting_tool_extension_length'], 'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
'cutting_tool_handle_type': obj['cutting_tool_handle_type'], 'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
'remark': obj['remark']
# 'FJGDate': obj[''] # 'FJGDate': obj['']
}) })

44
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -41,16 +41,16 @@
</field> </field>
</record> </record>
<record model="ir.ui.view" id="view_mrp_production_workorder_form_inherit_sf"> <!-- <record model="ir.ui.view" id="view_mrp_production_workorder_form_inherit_sf">-->
<field name="name">mrp.production.workorder.form.inherit.sf</field> <!-- <field name="name">mrp.production.workorder.form.inherit.sf</field>-->
<field name="model">mrp.workorder</field> <!-- <field name="model">mrp.workorder</field>-->
<field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/> <!-- <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>-->
<field name="arch" type="xml"> <!-- <field name="arch" type="xml">-->
<field name="production_id" position="after"> <!-- <field name="production_id" position="after">-->
<field name="processing_panel" readonly="1"/> <!-- <field name="processing_panel" readonly="1"/>-->
</field> <!-- </field>-->
</field> <!-- </field>-->
</record> <!-- </record>-->
<record id="view_mrp_production_workorder_tray_form_inherit_sf" model="ir.ui.view"> <record id="view_mrp_production_workorder_tray_form_inherit_sf" model="ir.ui.view">
<field name="name">mrp.production.workorder.tray.form.inherit.sf</field> <field name="name">mrp.production.workorder.tray.form.inherit.sf</field>
@@ -213,18 +213,18 @@
<field name="cnc_ids" widget="one2many"> <field name="cnc_ids" widget="one2many">
<tree> <tree>
<field name="cnc_id"/> <field name="cnc_id"/>
<field name="FNo"/> <field name="sequence_number"/>
<field name="FPGName"/> <field name="program_name"/>
<field name="FKnifeName"/> <field name="cutting_tool_name"/>
<field name="FDNo"/> <field name="cutting_tool_no"/>
<field name="FWorkType"/> <field name="processing_type"/>
<field name="FXY"/> <field name="margin_x_y"/>
<field name="FZ"/> <field name="margin_z"/>
<field name="FJGSD"/> <field name="depth_of_processing_z"/>
<field name="FSCCD"/> <field name="cutting_tool_extension_length"/>
<field name="FDJSpec"/> <field name="cutting_tool_handle_type"/>
<field name="FJGDate"/> <field name="estimated_processing_time"/>
<field name="FComment"/> <field name="remark"/>
</tree> </tree>
</field> </field>
</page> </page>