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

Merge branch 'feature/产品优化' into feature/程序用刀校验优化

Browse Source
This commit is contained in:
yuxianghui
2024-09-24 09:51:42 +08:00
parent fd88a37aec c9378fc9fe
commit aba270182d
2 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
sf_tool_management/models/base.py
View File

@@ -185,6 +185,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
_description = 'CAM工单程序用刀计划' _description = 'CAM工单程序用刀计划'
name = fields.Char('工单任务编号') name = fields.Char('工单任务编号')
programming_no = fields.Char('编程单号')
cam_procedure_code = fields.Char('程序名') cam_procedure_code = fields.Char('程序名')
filename = fields.Char('文件') filename = fields.Char('文件')
cam_cutter_spacing_code = fields.Char('刀号') cam_cutter_spacing_code = fields.Char('刀号')
@@ -317,23 +318,30 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
""" """
根据传入的工单信息，查询是否有需要的功能刀具，如果没有则生成CAM工单程序用刀计划 根据传入的工单信息，查询是否有需要的功能刀具，如果没有则生成CAM工单程序用刀计划
""" """
knife_plan = self.env['sf.cam.work.order.program.knife.plan'].sudo().create({
'name': cnc_processing.workorder_id.production_id.name, # 获取编程单号
'cam_procedure_code': cnc_processing.program_name, programming_no = cnc_processing.workorder_id.production_id.programming_no
'filename': cnc_processing.cnc_id.name, if not self.env['sf.cam.work.order.program.knife.plan'].sudo().search(
'functional_tool_name': cnc_processing.cutting_tool_name, [('programming_no', '=', programming_no),
'cam_cutter_spacing_code': cnc_processing.cutting_tool_no, ('functional_tool_name', '=', cnc_processing.cutting_tool_name)]):
'process_type': cnc_processing.processing_type, knife_plan = self.env['sf.cam.work.order.program.knife.plan'].sudo().create({
'margin_x_y': float(cnc_processing.margin_x_y), 'name': cnc_processing.workorder_id.production_id.name,
'margin_z': float(cnc_processing.margin_z), 'programming_no': programming_no,
'finish_depth': float(cnc_processing.depth_of_processing_z), 'cam_procedure_code': cnc_processing.program_name,
'extension_length': float(cnc_processing.cutting_tool_extension_length), 'filename': cnc_processing.cnc_id.name,
'shank_model': cnc_processing.cutting_tool_handle_type, 'functional_tool_name': cnc_processing.cutting_tool_name,
'estimated_processing_time': cnc_processing.estimated_processing_time, 'cam_cutter_spacing_code': cnc_processing.cutting_tool_no,
}) 'process_type': cnc_processing.processing_type,
logging.info('CAM工单程序用刀计划创建成功！！！') 'margin_x_y': float(cnc_processing.margin_x_y),
# 创建装刀请求 'margin_z': float(cnc_processing.margin_z),
knife_plan.apply_for_tooling() 'finish_depth': float(cnc_processing.depth_of_processing_z),
'extension_length': float(cnc_processing.cutting_tool_extension_length),
'shank_model': cnc_processing.cutting_tool_handle_type,
'estimated_processing_time': cnc_processing.estimated_processing_time,
})
logging.info('CAM工单程序用刀计划创建成功！！！')
# 创建装刀请求
knife_plan.apply_for_tooling()
def unlink_cam_plan(self, production): def unlink_cam_plan(self, production):
for item in production: for item in production:

13
sf_tool_management/views/tool_base_views.xml
View File

@@ -283,21 +283,22 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree create="0"> <tree create="0">
<field name="name" string="工单编码"/> <field name="name" string="工单编码"/>
<field name="cam_procedure_code"/> <field name="programming_no"/>
<field name="filename"/> <field name="cam_procedure_code" optional="hide"/>
<field name="filename" optional="hide"/>
<field name="functional_tool_name" string="刀具名称"/> <field name="functional_tool_name" string="刀具名称"/>
<field name="cam_cutter_spacing_code"/> <field name="cam_cutter_spacing_code"/>
<field name="diameter" optional="hide"/> <field name="diameter" optional="hide"/>
<field name="tool_included_angle" optional="hide"/> <field name="tool_included_angle" optional="hide"/>
<field name="process_type"/> <field name="process_type" optional="hide"/>
<field name="margin_x_y"/> <field name="margin_x_y"/>
<field name="margin_z"/> <field name="margin_z"/>
<field name="finish_depth"/> <field name="finish_depth"/>
<field name="extension_length" string="刀具伸出长度(mm)"/> <field name="extension_length" string="刀具伸出长度(mm)"/>
<field name="shank_model"/> <field name="shank_model"/>
<field name="estimated_processing_time"/> <field name="estimated_processing_time"/>
<field name="need_knife_time"/> <field name="need_knife_time" optional="hide"/>
<field name="applicant_time"/> <field name="applicant_time" optional="hide"/>
<field name="plan_execute_status"/> <field name="plan_execute_status"/>
<field name="production_line_id" invisible="1"/> <field name="production_line_id" invisible="1"/>
@@ -332,6 +333,7 @@
</div> </div>
<group> <group>
<group> <group>
<field name="programming_no"/>
<field name="cam_procedure_code"/> <field name="cam_procedure_code"/>
<field name="filename"/> <field name="filename"/>
<field name="production_line_id"/> <field name="production_line_id"/>
@@ -388,6 +390,7 @@
<field name="model">sf.cam.work.order.program.knife.plan</field> <field name="model">sf.cam.work.order.program.knife.plan</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search> <search>
<field name="programming_no"/>
<field name="name" string="工单编码"/> <field name="name" string="工单编码"/>
<field name="cam_procedure_code"/> <field name="cam_procedure_code"/>
<field name="filename"/> <field name="filename"/>