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

新增功能刀具组装界面和CAM工单程序用刀计划界面、机床换刀申请界面相互跳转功能按钮；功能刀具预警新增展示分组展示全部CNC机床，功能刀具实时分布修改数量相关字段类型为Integer，并新增自动计算合计数和总数功能

Browse Source
This commit is contained in:
yuxianghui
2023-08-09 15:00:59 +08:00
parent 924b838a83
commit 1e1b0dd359
4 changed files with 199 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
sf_tool_management/models/base.py
View File

@@ -180,14 +180,21 @@ class FunctionalToolWarning(models.Model):
install_tool_time = fields.Char("装刀时间", readonly=False) install_tool_time = fields.Char("装刀时间", readonly=False)
outbound_time = fields.Char('出库时间', readonly=False) outbound_time = fields.Char('出库时间', readonly=False)
on_board_time = fields.Char('上机时间', readonly=False) on_board_time = fields.Char('上机时间', readonly=False)
machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=False, tracking=True,
group_expand='_read_group_machine_table_name_ids')
@api.model
def _read_group_machine_table_name_ids(self, categories, domain, order):
machine_table_name_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
return categories.browse(machine_table_name_ids)
machine_tool_code = fields.Char('机台号', readonly=False) machine_tool_code = fields.Char('机台号', readonly=False)
cutting_tool_code = fields.Char('刀位号', readonly=False) cutting_tool_code = fields.Char('刀位号', readonly=False)
idle_time = fields.Char('闲置时长', readonly=False) idle_time = fields.Char('闲置时长', readonly=False)
alarm_value = fields.Char('报警值', readonly=False) alarm_value = fields.Char('报警值', readonly=False)
used_value = fields.Char('已使用值', readonly=False) used_value = fields.Char('已使用值', readonly=False)
alarm_type = fields.Char('报警类型', readonly=False) alarm_type = fields.Char('报警类型', readonly=False)
alarm_time = fields.Char('报警时间', readonly=False)
dispose_user = fields.Char('处理人', readonly=False) dispose_user = fields.Char('处理人', readonly=False)
alarm_time = fields.Char('报警时间', readonly=False)
dispose_time = fields.Char('处理时间', readonly=False) dispose_time = fields.Char('处理时间', readonly=False)
dispose_func = fields.Char('处理方法/措施', readonly=False) dispose_func = fields.Char('处理方法/措施', readonly=False)
remark = fields.Char('备注', readonly=False) remark = fields.Char('备注', readonly=False)
@@ -251,17 +258,36 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
image = fields.Binary('图片', readonly=True) image = fields.Binary('图片', readonly=True)
# 功能刀具实时分布 # 功能刀具实时分布
tool_stock_num = fields.Char(string='刀具房库存数量', readonly=False) tool_stock_num = fields.Integer(string='刀具房库存数量', readonly=False)
side_shelf_num = fields.Char(string='线边货架货架数量', readonly=False) side_shelf_num = fields.Integer(string='线边货架货架数量', readonly=False)
on_tool_stock_num = fields.Char(string='机内刀库库存数量', readonly=False) on_tool_stock_num = fields.Integer(string='机内刀库库存数量', readonly=False)
tool_stock_total = fields.Char(string='合计', readonly=False) tool_stock_total = fields.Integer(string='合计(库存)', readonly=True, compute='_compute_tool_stock_total')
return_reuse_num_re = fields.Char(string='归还再用数量(精)', readonly=False) return_reuse_num_re = fields.Integer(string='归还再用数量(精)', readonly=False)
return_reuse_num_co = fields.Char(string='归还再用数量(粗)', readonly=False) return_reuse_num_co = fields.Integer(string='归还再用数量(粗)', readonly=False)
return_processing_num = fields.Char(string='归还需磨削数量', readonly=False) return_processing_num = fields.Integer(string='归还需磨削数量', readonly=False)
return_total = fields.Char(string='合计', readonly=False) return_total = fields.Integer(string='合计(归还)', readonly=True, compute='_compute_return_total')
total = fields.Char(string='总计', readonly=False) total = fields.Integer(string='总计', readonly=True, compute='_compute_total')
remark = fields.Char(string='备注/说明', readonly=False) remark = fields.Char(string='备注/说明', readonly=False)
@api.depends('tool_stock_num', 'side_shelf_num', 'on_tool_stock_num')
def _compute_tool_stock_total(self):
for record in self:
if record:
self.tool_stock_total = record.tool_stock_num + record.side_shelf_num + record.on_tool_stock_num
@api.depends('return_reuse_num_re', 'return_reuse_num_co', 'return_processing_num')
def _compute_return_total(self):
for record in self:
if record:
self.return_total = record.return_reuse_num_re + record.return_reuse_num_co + record.return_processing_num
@api.depends('tool_stock_total', 'return_total')
def _compute_total(self):
for record in self:
if record:
self.total = record.tool_stock_total + record.return_total
class InboundAndOutboundRecordsOfFunctionalTools(models.Model): class InboundAndOutboundRecordsOfFunctionalTools(models.Model):
_name = 'sf.inbound.and.outbound.records.of.functional.tools' _name = 'sf.inbound.and.outbound.records.of.functional.tools'
@@ -377,6 +403,8 @@ class MachineTableToolChangingApply(models.Model):
status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移')], string='操作状态', default='0') status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移')], string='操作状态', default='0')
sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装')
@api.model @api.model
def _read_group_names(self, categories, domain, order): def _read_group_names(self, categories, domain, order):
names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
@@ -471,7 +499,8 @@ class MachineTableToolChangingApply(models.Model):
'used_tool_time': None, 'used_tool_time': None,
'reason_for_applying': None, 'reason_for_applying': None,
'remark': None, 'remark': None,
'status': '0' 'status': '0',
'sf_functional_tool_assembly_id': None,
}) })
@@ -485,6 +514,16 @@ class MachineTableToolChangingApply(models.Model):
'status': '0' 'status': '0'
}) })
def open_sf_functional_tool_assembly(self):
"""
跳转到功能刀具组装界面按键功能
:return:
"""
action = self.env.ref('sf_tool_management.sf_functional_tool_assembly_view_act')
result = action.read()[0]
result['domain'] = [('sf_machine_table_tool_changing_apply_id', '=', self.id)]
return result
class CAMWorkOrderProgramKnifePlan(models.Model): class CAMWorkOrderProgramKnifePlan(models.Model):
_name = 'sf.cam.work.order.program.knife.plan' _name = 'sf.cam.work.order.program.knife.plan'
@@ -519,12 +558,14 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
reason_for_applying = fields.Char(string='申请原因', readonly=False) reason_for_applying = fields.Char(string='申请原因', readonly=False)
remark = fields.Char(string='备注说明', readonly=False) remark = fields.Char(string='备注说明', readonly=False)
sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装')
def apply_for_tooling(self): def apply_for_tooling(self):
""" """
申请装刀 申请装刀
:return: :return:
""" """
self.env['sf.functional.tool.assembly'].create({ record = self.env['sf.functional.tool.assembly'].create({
'functional_tool_code': self.functional_tool_code, 'functional_tool_code': self.functional_tool_code,
'name': self.functional_tool_name_id.id, 'name': self.functional_tool_name_id.id,
'functional_tool_type_id': self.functional_tool_type_id.id, 'functional_tool_type_id': self.functional_tool_type_id.id,
@@ -538,33 +579,43 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
'use_tool_time': self.need_knife_time, 'use_tool_time': self.need_knife_time,
'machine_tool_name_id': self.machine_table_name_id.id, 'machine_tool_name_id': self.machine_table_name_id.id,
'machine_tool_code': self.cam_procedure_code, 'machine_tool_code': self.cam_procedure_code,
'cutter_spacing_code': self.cam_cutter_spacing_code 'cutter_spacing_code': self.cam_cutter_spacing_code,
'sf_cam_work_order_program_knife_plan_id': self.id
}) })
self.sf_functional_tool_assembly_id = record.id
# 将计划执行状态改为执行中 # 将计划执行状态改为执行中
self.env['sf.cam.work.order.program.knife.plan'].search( self.env['sf.cam.work.order.program.knife.plan'].search(
[('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '1', [('functional_tool_code', '=', self.functional_tool_code)]).write({
'applicant': self.env.user.name}) 'plan_execute_status': '1',
'applicant': self.env.user.name})
def revocation(self): def revocation(self):
""" """
撤回装刀申请 撤回装刀申请
:return: :return:
""" """
self.env['sf.functional.tool.assembly'].search( self.env['sf.functional.tool.assembly'].search(
[('functional_tool_code', '=', self.functional_tool_code), [('functional_tool_code', '=', self.functional_tool_code),
('loading_task_source', '=', '0')]).unlink() ('loading_task_source', '=', '0')]).unlink()
# 将计划执行状态改为待执行 # 将计划执行状态改为待执行，同时清除申请人、功能刀具组装字段数据
self.env['sf.cam.work.order.program.knife.plan'].search( self.env['sf.cam.work.order.program.knife.plan'].search(
[('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '0', [('functional_tool_code', '=', self.functional_tool_code)]).write({
'applicant': None}) 'plan_execute_status': '0',
'applicant': None,
'sf_functional_tool_assembly_id': None,
})
def open_sf_functional_tool_assembly(self):
"""
跳转到功能刀具组装界面按键功能
:return:
"""
action = self.env.ref('sf_tool_management.sf_functional_tool_assembly_view_act')
result = action.read()[0]
result['domain'] = [('sf_cam_work_order_program_knife_plan_id', '=', self.id)]
return result
class FunctionalToolAssembly(models.Model): class FunctionalToolAssembly(models.Model):
@@ -572,6 +623,7 @@ class FunctionalToolAssembly(models.Model):
_description = '功能刀具组装' _description = '功能刀具组装'
_order = 'use_tool_time asc' _order = 'use_tool_time asc'
functional_tool_code = fields.Char(string='功能刀具编码', readonly=True) functional_tool_code = fields.Char(string='功能刀具编码', readonly=True)
name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True) name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True)
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
@@ -656,6 +708,26 @@ class FunctionalToolAssembly(models.Model):
remark = fields.Char(string='备注说明', readonly=True) remark = fields.Char(string='备注说明', readonly=True)
check_box_1 = fields.Boolean(string='复选框', default=False, readonly=False) check_box_1 = fields.Boolean(string='复选框', default=False, readonly=False)
sf_machine_table_tool_changing_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', '机床换刀申请')
sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan', 'CAM工单程序用刀计划')
def open_sf_cam_work_order_program_knife_plan(self):
"""
跳转到CAM工单程序用刀计划界面按钮功能
"""
action = self.env.ref('sf_tool_management.sf_cam_work_order_program_knife_plan_view_act')
result = action.read()[0]
result['domain'] = [('sf_functional_tool_assembly_id', '=', self.id)]
return result
def open_sf_machine_table_tool_changing_apply(self):
"""
跳转到机床换刀申请界面按钮功能
"""
action = self.env.ref('sf_tool_management.sf_machine_table_tool_changing_apply_view_act')
result = action.read()[0]
result['domain'] = [('sf_functional_tool_assembly_id', '=', self.id)]
return result
def cancel_functional_tool_assembly(self): def cancel_functional_tool_assembly(self):
""" """

73
sf_tool_management/views/tool_base_views.xml
View File

@@ -235,7 +235,7 @@
<field name="dispose_func" optional="show"/> <field name="dispose_func" optional="show"/>
<field name="remark" optional="show"/> <field name="remark" optional="show"/>
<searchpanel> <searchpanel>
<field name="mrs_cutting_tool_type_id" icon="fa-building" enable_counters="1"/> <field name="machine_table_name_id" string="CNC机床列表" icon="fa-building" enable_counters="1"/>
</searchpanel> </searchpanel>
</search> </search>
</field> </field>
@@ -313,17 +313,34 @@
<page string="实时分布信息"> <page string="实时分布信息">
<group> <group>
<group> <group>
<field name="tool_stock_num"/> <group>
<field name="side_shelf_num"/> <field name="tool_stock_num"/>
<field name="on_tool_stock_num"/> <field name="return_reuse_num_re"/>
<field name="tool_stock_total"/> </group>
<group>
<field name="side_shelf_num"/>
<field name="return_reuse_num_co"/>
</group>
<!-- <field name="tool_stock_num"/>-->
<!-- <field name="side_shelf_num"/>-->
<!-- <field name="on_tool_stock_num"/>-->
<!-- <field name="tool_stock_total"/>-->
</group> </group>
<group> <group>
<field name="return_reuse_num_re"/> <group>
<field name="return_reuse_num_co"/> <field name="on_tool_stock_num"/>
<field name="return_processing_num"/> <field name="return_processing_num"/>
<field name="return_total"/> </group>
<field name="total"/> <group>
<field name="tool_stock_total"/>
<field name="return_total"/>
<field name="total"/>
</group>
<!-- <field name="return_reuse_num_re"/>-->
<!-- <field name="return_reuse_num_co"/>-->
<!-- <field name="return_processing_num"/>-->
<!-- <field name="return_total"/>-->
<!-- <field name="total"/>-->
</group> </group>
</group> </group>
</page> </page>
@@ -551,6 +568,7 @@
type="action" type="action"
context="{ 'default_name':name, context="{ 'default_name':name,
'default_machine_tool_code': machine_tool_code, 'default_machine_tool_code': machine_tool_code,
'default_functional_tool_code': functional_tool_code,
'default_functional_tool_name_id': functional_tool_name_id, 'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id, 'default_functional_tool_type_id': functional_tool_type_id,
'default_cutter_spacing_code': cutter_spacing_code, 'default_cutter_spacing_code': cutter_spacing_code,
@@ -573,6 +591,8 @@
class="btn-primary" class="btn-primary"
attrs="{'invisible': [('status', '!=', '0')]}" 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="是否确认撤回转移"/> <button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
</tree> </tree>
@@ -590,6 +610,7 @@
type="action" type="action"
context="{ 'default_name':name, context="{ 'default_name':name,
'default_machine_tool_code': machine_tool_code, 'default_machine_tool_code': machine_tool_code,
'default_functional_tool_code': functional_tool_code,
'default_functional_tool_name_id': functional_tool_name_id, 'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id, 'default_functional_tool_type_id': functional_tool_type_id,
'default_cutter_spacing_code': cutter_spacing_code, 'default_cutter_spacing_code': cutter_spacing_code,
@@ -610,11 +631,12 @@
'default_functional_tool_name_id': functional_tool_name_id, 'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id}" 'default_functional_tool_type_id': functional_tool_type_id}"
class="btn-primary" class="btn-primary"
attrs="{'invisible': [('status', '!=', '0')]}" attrs="{'invisible': [('status', '!=', '0')]}"/>
/> <button string="查看组装单" type="object" name="open_sf_functional_tool_assembly"
<button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}" confirm="是否确认撤回换刀申请"/> class="oe_highlight" attrs="{'invisible': [('status', '!=', '1')]}"/>
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/> <button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}" confirm="是否确认撤回换刀申请"/>
</header> <button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}" confirm="是否确认撤回转移"/>
</header>
<sheet> <sheet>
<group string="基础信息"> <group string="基础信息">
<group> <group>
@@ -685,11 +707,6 @@
<field name="name" enable_counters="1" icon="fa-building"/> <field name="name" enable_counters="1" icon="fa-building"/>
</searchpanel> </searchpanel>
</search> </search>
<!-- <xpath expr="//field[@name='name']" position="after">-->
<!-- <searchpanel>-->
<!-- <field name="name" icon="fa-building" enable_counters="1" domain="[('name', '!=', False)]"/>-->
<!-- </searchpanel>-->
<!-- </xpath>-->
</field> </field>
</record> </record>
@@ -719,6 +736,8 @@
<field name="remark" optional="hide"/> <field name="remark" optional="hide"/>
<field name="plan_execute_status" invisible="True"/> <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="申请装刀" 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="是否确认撤回装刀"/> <button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
</tree> </tree>
</field> </field>
@@ -731,6 +750,8 @@
<form> <form>
<header> <header>
<button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/> <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="是否确认撤回装刀"/> <button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}" confirm="是否确认撤回装刀"/>
</header> </header>
@@ -848,6 +869,10 @@
<button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary" confirm="是否确认取消组装"/> <button string="取消组装" name="cancel_functional_tool_assembly" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary" confirm="是否确认取消组装"/>
<button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/> <button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="组装单打印" name="assemble_single_print" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印组装单"/> <button string="组装单打印" name="assemble_single_print" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印组装单"/>
<button string="查看CAM工单程序用刀计划" type="object" name="open_sf_cam_work_order_program_knife_plan"
class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '0')]}" />
<button string="查看机床换刀申请" type="object" name="open_sf_machine_table_tool_changing_apply"
class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '1')]}" />
</tree> </tree>
</field> </field>
</record> </record>
@@ -881,9 +906,13 @@
<button string="打印二维码" name="automatic_printing_of_QR_code" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印二维码"/> <button string="打印二维码" name="automatic_printing_of_QR_code" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印二维码"/>
<button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/> <button string="出库" name="show_popup" type="object" attrs="{'invisible': [('assemble_status', '!=', '1')]}" class="btn-primary"/>
<button string="组装单打印" name="assemble_single_print" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印组装单"/> <button string="组装单打印" name="assemble_single_print" type="object" attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary" confirm="是否确认打印组装单"/>
<button string="查看CAM工单程序用刀计划" type="object" name="open_sf_cam_work_order_program_knife_plan"
class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '0')]}" />
<button string="查看机床换刀申请" type="object" name="open_sf_machine_table_tool_changing_apply"
class="oe_highlight" attrs="{'invisible': [('loading_task_source', '!=', '1')]}" />
</header> </header>
<sheet> <sheet>
<group string="功能刀具信息"> <group string="功能刀具信息">

86
sf_tool_management/wizard/wizard.py
View File

@@ -10,12 +10,14 @@ class ToolChangeRequirementInformation(models.TransientModel):
name = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True) name = fields.Many2one('maintenance.equipment', string='CNC机床', readonly=True)
machine_tool_code = fields.Char(string='机台号', readonly=True) machine_tool_code = fields.Char(string='机台号', readonly=True)
cutter_spacing_code = fields.Char(string='刀位号', readonly=True) cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
functional_tool_code = fields.Char(string='功能刀具编码', readonly=True)
functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True) functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True)
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True) functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
replacement_tool_code = fields.Char(string='待换功能刀具编码', readonly=True) replacement_tool_code = fields.Char(string='待换功能刀具编码', readonly=True)
replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换功能刀具名称') replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换功能刀具名称')
replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型', readonly=True) replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型',
readonly=True)
replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
string='粗/中/精') string='粗/中/精')
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧') new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧')
@@ -36,6 +38,27 @@ class ToolChangeRequirementInformation(models.TransientModel):
确认换刀申请（按键） 确认换刀申请（按键）
:return: :return:
""" """
# 将数据更新到机台换刀申请界面
record = self.env['sf.machine.table.tool.changing.apply'].search(
[('name', '=', self.name.id),
('machine_tool_code', '=', self.machine_tool_code),
('cutter_spacing_code', '=', self.cutter_spacing_code),
])
# 功能刀具组装创建新任务(new_assembly_task)
record_1 = self.env['sf.functional.tool.assembly'].sudo().create({
'functional_tool_code': self.replacement_tool_code,
'name': self.replacement_tool_name_id.id,
'functional_tool_type_id': self.replacement_tool_type_id.id,
'loading_task_source': '1',
'applicant': self.applicant,
'reason_for_applying': self.reason_for_applying,
'use_tool_time': self.used_tool_time,
'machine_tool_name_id': self.name.id,
'machine_tool_code': self.machine_tool_code,
'cutter_spacing_code': self.cutter_spacing_code,
'sf_machine_table_tool_changing_apply_id': record.id,
})
# 封装数据 # 封装数据
desc = { desc = {
'name': self.name.id, 'name': self.name.id,
@@ -50,26 +73,10 @@ class ToolChangeRequirementInformation(models.TransientModel):
'used_tool_time': self.used_tool_time, 'used_tool_time': self.used_tool_time,
'reason_for_applying': self.reason_for_applying, 'reason_for_applying': self.reason_for_applying,
'remark': self.new_former, 'remark': self.new_former,
'status': '1' 'status': '1',
'sf_functional_tool_assembly_id': record_1.id,
} }
print('desc:', desc) record.write(desc)
# 将数据更新到机台换刀申请界面
self.env['sf.machine.table.tool.changing.apply'].search(
[('name', '=', desc.get('name'))]).write(desc)
# 功能刀具组装创建新任务
self.env['sf.machine.table.tool.changing.apply'].new_assembly_task({
'functional_tool_code': self.replacement_tool_code,
'name': self.replacement_tool_name_id.id,
'functional_tool_type_id': self.replacement_tool_type_id.id,
'loading_task_source': '1',
'applicant': self.applicant,
'reason_for_applying': self.reason_for_applying,
'use_tool_time': self.used_tool_time,
'machine_tool_name_id': self.name.id,
'machine_tool_code': self.machine_tool_code,
'cutter_spacing_code': self.cutter_spacing_code
})
# 关闭弹出窗口 # 关闭弹出窗口
return {'type': 'ir.actions.act_window_close'} return {'type': 'ir.actions.act_window_close'}
@@ -129,52 +136,58 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
# 功能刀具组装信息 # 功能刀具组装信息
# 整体式刀具型号 # 整体式刀具型号
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id', mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_assembly_order_id',
string='整体式刀具型号', readonly=False, domain= string='整体式刀具型号', readonly=False, domain=
[('mrs_cutting_tool_material_name', '=', '整体式刀具')]) [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
integral_code = fields.Char('整体式刀具序列号', readonly=True, compute='_onchange_mrs_cutting_tool_integral_model_ids') integral_code = fields.Char('整体式刀具序列号', readonly=True,
compute='_compute_mrs_cutting_tool_integral_model_ids')
integral_name = fields.Char('整体式刀具名称', readonly=True) integral_name = fields.Char('整体式刀具名称', readonly=True)
sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌', readonly=True) sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌', readonly=True)
# 刀片型号 # 刀片型号
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id', mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
string='刀片型号', readonly=False, domain= string='刀片型号', readonly=False, domain=
[('mrs_cutting_tool_material_name', '=', '刀片')]) [('mrs_cutting_tool_material_name', '=', '刀片')])
blade_code = fields.Char('刀片序列号', readonly=True, compute='_onchange_mrs_cutting_tool_blade_model_ids') blade_code = fields.Char('刀片序列号', readonly=True, compute='_compute_mrs_cutting_tool_blade_model_ids')
blade_name = fields.Char('刀片名称', readonly=True) blade_name = fields.Char('刀片名称', readonly=True)
sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True) sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True)
# 刀杆型号 # 刀杆型号
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id', mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_assembly_order_id',
string='刀杆型号', readonly=False, domain= string='刀杆型号', readonly=False, domain=
[('mrs_cutting_tool_material_name', '=', '刀杆')]) [('mrs_cutting_tool_material_name', '=', '刀杆')])
bar_code = fields.Char('刀杆序列号', readonly=True, compute='_onchange_mrs_cutting_tool_cutterbar_model_ids') bar_code = fields.Char('刀杆序列号', readonly=True, compute='_compute_mrs_cutting_tool_cutterbar_model_ids')
bar_name = fields.Char('刀杆名称', readonly=True) bar_name = fields.Char('刀杆名称', readonly=True)
sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True) sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True)
# 刀盘型号 # 刀盘型号
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id', mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_assembly_order_id',
string='刀盘型号', readonly=False, domain= string='刀盘型号', readonly=False, domain=
[('mrs_cutting_tool_material_name', '=', '刀盘')]) [('mrs_cutting_tool_material_name', '=', '刀盘')])
pad_code = fields.Char('刀盘序列号', readonly=True, compute='_onchange_mrs_cutting_tool_cutterpad_model_ids') pad_code = fields.Char('刀盘序列号', readonly=True, compute='_compute_mrs_cutting_tool_cutterpad_model_ids')
pad_name = fields.Char('刀盘名称', readonly=True) pad_name = fields.Char('刀盘名称', readonly=True)
sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True) sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True)
# 刀柄型号 # 刀柄型号
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id', mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_assembly_order_id',
string='刀柄型号', readonly=False, domain= string='刀柄型号', readonly=False, domain=
[('mrs_cutting_tool_material_name', '=', '刀柄')]) [('mrs_cutting_tool_material_name', '=', '刀柄')])
handle_code = fields.Char('刀柄序列号', readonly=True, compute='_onchange_mrs_cutting_tool_cutterhandle_model_ids') handle_code = fields.Char('刀柄序列号', readonly=True, compute='_compute_mrs_cutting_tool_cutterhandle_model_ids')
handle_name = fields.Char('刀柄名称', readonly=True) handle_name = fields.Char('刀柄名称', readonly=True)
sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True) sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True)
# 夹头型号 # 夹头型号
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id', mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
'sf_functional_tool_assembly_order_id',
string='夹头型号', readonly=False, domain= string='夹头型号', readonly=False, domain=
[('mrs_cutting_tool_material_name', '=', '夹头')]) [('mrs_cutting_tool_material_name', '=', '夹头')])
chuck_code = fields.Char('夹头序列号', readonly=True, compute='_onchange_mrs_cutting_tool_cutterhead_model_ids') chuck_code = fields.Char('夹头序列号', readonly=True, compute='_compute_mrs_cutting_tool_cutterhead_model_ids')
chuck_name = fields.Char('夹头名称', readonly=True) chuck_name = fields.Char('夹头名称', readonly=True)
sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True) sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精') coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', default='1')
tool_loading_length = fields.Char(string='装刀长') tool_loading_length = fields.Char(string='装刀长')
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧') new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', required=True, default='1')
reference_length = fields.Char(string='参考伸出长') reference_length = fields.Char(string='参考伸出长')
cut_time = fields.Char(string='已切削时间') cut_time = fields.Char(string='已切削时间')
cut_length = fields.Char(string='已切削长度') cut_length = fields.Char(string='已切削长度')
@@ -211,7 +224,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
self.sf_tool_brand_id_3 = val.mrs_machine_brand_id.id self.sf_tool_brand_id_3 = val.mrs_machine_brand_id.id
@api.depends('mrs_cutting_tool_cutterpad_model_ids') @api.depends('mrs_cutting_tool_cutterpad_model_ids')
def _compute_mrs_cutting_tool_cutterbar_model_ids(self): def _compute_mrs_cutting_tool_cutterpad_model_ids(self):
if not self.mrs_cutting_tool_cutterpad_model_ids: if not self.mrs_cutting_tool_cutterpad_model_ids:
self.pad_code = None self.pad_code = None
for val in self.mrs_cutting_tool_cutterpad_model_ids: for val in self.mrs_cutting_tool_cutterpad_model_ids:
@@ -231,7 +244,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
self.sf_tool_brand_id_5 = val.mrs_machine_brand_id.id self.sf_tool_brand_id_5 = val.mrs_machine_brand_id.id
@api.depends('mrs_cutting_tool_cutterhead_model_ids') @api.depends('mrs_cutting_tool_cutterhead_model_ids')
def _compute_mrs_cutting_tool_cutterhandle_model_ids(self): def _compute_mrs_cutting_tool_cutterhead_model_ids(self):
if not self.mrs_cutting_tool_cutterhead_model_ids: if not self.mrs_cutting_tool_cutterhead_model_ids:
self.chuck_code = None self.chuck_code = None
for val in self.mrs_cutting_tool_cutterhead_model_ids: for val in self.mrs_cutting_tool_cutterhead_model_ids:
@@ -395,6 +408,3 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
'receive_person': self.env.user.name, 'receive_person': self.env.user.name,
'receive_time': fields.Datetime.now() 'receive_time': fields.Datetime.now()
}) })

9
sf_tool_management/wizard/wizard_view.xml
View File

@@ -10,25 +10,26 @@
<group string="机床信息" col="3"> <group string="机床信息" col="3">
<group> <group>
<field name="name"/> <field name="name"/>
<field name="functional_tool_name_id"/> <field name="functional_tool_code"/>
</group> </group>
<group> <group>
<field name="machine_tool_code"/> <field name="machine_tool_code"/>
<field name="functional_tool_type_id"/> <field name="functional_tool_name_id"/>
</group> </group>
<group> <group>
<field name="cutter_spacing_code"/> <field name="cutter_spacing_code"/>
<field name="functional_tool_type_id"/>
</group> </group>
</group> </group>
<group string="功能刀具信息"> <group string="功能刀具信息">
<group> <group>
<field name="replacement_tool_name_id"/> <field name="replacement_tool_name_id"/>
<field name="replacement_tool_code"/> <field name="replacement_tool_type_id"/>
<field name="replacement_tool_coarse_middle_thin"/> <field name="replacement_tool_coarse_middle_thin"/>
<field name="applicant"/> <field name="applicant"/>
</group> </group>
<group> <group>
<field name="replacement_tool_type_id"/> <field name="replacement_tool_code"/>
<field name="used_tool_time"/> <field name="used_tool_time"/>
<field name="new_former"/> <field name="new_former"/>
<field name="reason_for_applying"/> <field name="reason_for_applying"/>