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

1、刀具管理-机床换刀申请、CAM工单程序用刀计划、功能刀具组装增加了机床、功能刀具和功能刀具类型字段的关联关系，增加了tree视图功能按键 2、优化了CAM工单程序用刀计划的按键功能 3、对三个对象的字段的可读性进行了调整

Browse Source
This commit is contained in:
yuxianghui
2023-08-01 17:41:21 +08:00
parent 06630fb85e
commit d574925122
5 changed files with 288 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

273
sf_tool_management/models/base.py
View File

@@ -123,20 +123,20 @@ class FunctionalToolWarning(models.Model):
image = fields.Binary('图片', readonly=True) image = fields.Binary('图片', readonly=True)
# 功能刀具预警 特有字段 # 功能刀具预警 特有字段
install_tool_time = fields.Char("装刀时间", readonly=True) install_tool_time = fields.Char("装刀时间", readonly=False)
outbound_time = fields.Char('出库时间', readonly=True) outbound_time = fields.Char('出库时间', readonly=False)
on_board_time = fields.Char('上机时间', readonly=True) on_board_time = fields.Char('上机时间', readonly=False)
machine_tool_code = fields.Char('机台号', readonly=True) machine_tool_code = fields.Char('机台号', readonly=False)
cutting_tool_code = fields.Char('刀位号', readonly=True) cutting_tool_code = fields.Char('刀位号', readonly=False)
idle_time = fields.Char('闲置时长', readonly=True) idle_time = fields.Char('闲置时长', readonly=False)
alarm_value = fields.Char('报警值', readonly=True) alarm_value = fields.Char('报警值', readonly=False)
used_value = fields.Char('已使用值', readonly=True) used_value = fields.Char('已使用值', readonly=False)
alarm_type = fields.Char('报警类型', readonly=True) alarm_type = fields.Char('报警类型', readonly=False)
alarm_time = fields.Char('报警时间', readonly=True) alarm_time = fields.Char('报警时间', readonly=False)
dispose_user = fields.Char('处理人', readonly=True) dispose_user = fields.Char('处理人', readonly=False)
dispose_time = fields.Char('处理时间', readonly=True) dispose_time = fields.Char('处理时间', readonly=False)
dispose_func = fields.Char('处理方法/措施', readonly=True) dispose_func = fields.Char('处理方法/措施', readonly=False)
remark = fields.Char('备注', readonly=True) remark = fields.Char('备注', readonly=False)
@api.onchange('functional_cutting_tool_id') @api.onchange('functional_cutting_tool_id')
def onchange_functional_cutting_tool_id(self): def onchange_functional_cutting_tool_id(self):
@@ -197,16 +197,16 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
image = fields.Binary('图片', readonly=True) image = fields.Binary('图片', readonly=True)
# 功能刀具实时分布 # 功能刀具实时分布
tool_stock_num = fields.Char(string='刀具房库存数量', readonly=True) tool_stock_num = fields.Char(string='刀具房库存数量', readonly=False)
side_shelf_num = fields.Char(string='线边货架货架数量', readonly=True) side_shelf_num = fields.Char(string='线边货架货架数量', readonly=False)
on_tool_stock_num = fields.Char(string='机内刀库库存数量', readonly=True) on_tool_stock_num = fields.Char(string='机内刀库库存数量', readonly=False)
tool_stock_total = fields.Char(string='合计', readonly=True) tool_stock_total = fields.Char(string='合计', readonly=False)
return_reuse_num_re = fields.Char(string='归还再用数量(精)', readonly=True) return_reuse_num_re = fields.Char(string='归还再用数量(精)', readonly=False)
return_reuse_num_co = fields.Char(string='归还再用数量(粗)', readonly=True) return_reuse_num_co = fields.Char(string='归还再用数量(粗)', readonly=False)
return_processing_num = fields.Char(string='归还需磨削数量', readonly=True) return_processing_num = fields.Char(string='归还需磨削数量', readonly=False)
return_total = fields.Char(string='合计', readonly=True) return_total = fields.Char(string='合计', readonly=False)
total = fields.Char(string='总计', readonly=True) total = fields.Char(string='总计', readonly=False)
remark = fields.Char(string='备注/说明', readonly=True) remark = fields.Char(string='备注/说明', readonly=False)
class InboundAndOutboundRecordsOfFunctionalTools(models.Model): class InboundAndOutboundRecordsOfFunctionalTools(models.Model):
@@ -263,25 +263,25 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model):
image = fields.Binary('图片', readonly=True) image = fields.Binary('图片', readonly=True)
# 功能刀具出入库记录 特有字段 # 功能刀具出入库记录 特有字段
thickness = fields.Selection([('1', '粗'), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True) thickness = fields.Selection([('1', '粗'), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False)
max_life_span = fields.Char(string='最大寿命值', readonly=True) max_life_span = fields.Char(string='最大寿命值', readonly=False)
alarm_value = fields.Char(string='报警值', readonly=True) alarm_value = fields.Char(string='报警值', readonly=False)
used_value = fields.Char(string='已使用值', readonly=True) used_value = fields.Char(string='已使用值', readonly=False)
current_state = fields.Char(string='当前状态', readonly=True) current_state = fields.Char(string='当前状态', readonly=False)
current_store_area = fields.Char(string='当前库区', readonly=True) current_store_area = fields.Char(string='当前库区', readonly=False)
current_store_place = fields.Char(string='当前库位', readonly=True) current_store_place = fields.Char(string='当前库位', readonly=False)
number = fields.Integer(string='数量', readonly=True) number = fields.Integer(string='数量', readonly=False)
reason_application = fields.Char(string='申请原因', readonly=True) reason_application = fields.Char(string='申请原因', readonly=False)
applicant = fields.Char(string='申请人', readonly=True) applicant = fields.Char(string='申请人', readonly=False)
return_staff = fields.Char(string='归还人', readonly=True) return_staff = fields.Char(string='归还人', readonly=False)
return_time = fields.Date(string='归还入库时间', readonly=True) return_time = fields.Date(string='归还入库时间', readonly=False)
tool_state = fields.Char(string="刀具状态", readonly=True) tool_state = fields.Char(string="刀具状态", readonly=False)
tool_install_staff = fields.Char(string='装刀人', readonly=True) tool_install_staff = fields.Char(string='装刀人', readonly=False)
tool_install_time = fields.Datetime(string='装刀时间', readonly=True) tool_install_time = fields.Datetime(string='装刀时间', readonly=False)
receive_equipment = fields.Char(string='领用机台', readonly=True) receive_equipment = fields.Char(string='领用机台', readonly=False)
receive_staff = fields.Char(string='领用人', readonly=True) receive_staff = fields.Char(string='领用人', readonly=False)
receive_time = fields.Char(string='领用出库时间', readonly=True) receive_time = fields.Char(string='领用出库时间', readonly=False)
remark = fields.Text(string='备注/说明', readonly=True) remark = fields.Text(string='备注/说明', readonly=False)
class MachineTableToolChangingApply(models.Model): class MachineTableToolChangingApply(models.Model):
@@ -294,37 +294,43 @@ class MachineTableToolChangingApply(models.Model):
# string='换刀需求信息', # string='换刀需求信息',
# attrs="{'invisible': 1}") # attrs="{'invisible': 1}")
name = fields.Char(string='CNC机床', readonly="True") name = fields.Many2one('sf.machine_tool', string='CNC机床', readonly=False)
# todo 机床类型和刀位号 为 Many2one machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=False)
machine_table_type = fields.Char(string='机床类型', readonly="True")
machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}") machine_tool_code = fields.Char(string='机台号', attrs="{'invisible': 1}")
cutter_spacing_code = fields.Char(string='刀位号', readonly="True") cutter_spacing_code = fields.Char(string='刀位号', readonly=False)
functional_tool_code = fields.Char(string='功能刀具编码', readonly="True") functional_tool_code = fields.Char(string='功能刀具编码', readonly=True, compute='_compute_functional_tool_name_id')
functional_tool_name = fields.Char(string='功能刀具名称', readonly="True") functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False)
# todo 功能刀具类型为 Many2one functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',string='功能刀具类型', readonly=True, compute='_compute_functional_tool_name_id')
functional_tool_type = fields.Char(string='功能刀具类型', readonly="True") diameter = fields.Char(string='直径', readonly=False)
diameter = fields.Char(string='直径', readonly="True") coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly="True") hilt_name = fields.Char(string='刀柄名称', readonly=False)
hilt_name = fields.Char(string='刀柄名称', readonly="True") hilt_code = fields.Char(string='刀柄编号', readonly=False)
hilt_code = fields.Char(string='刀柄编号', readonly="True") max_lifetime_value = fields.Char(string='最大寿命值', readonly=False)
max_lifetime_value = fields.Char(string='最大寿命值', readonly="True") alarm_value = fields.Char(string='报警值', readonly=False)
alarm_value = fields.Char(string='报警值', readonly="True") used_value = fields.Char(string='已使用值', readonly=False)
used_value = fields.Char(string='已使用值', readonly="True") functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态', default='正常', readonly=False)
functional_tool_status = fields.Selection([('正常', '正常'), ('异常', '异常')], string='功能刀具状态', default='正常', readonly="True")
replacement_tool_code = fields.Char(string='待换刀具编码', readonly="True") replacement_tool_code = fields.Char(string='待换刀具编码', readonly=True)
replacement_tool_name = fields.Char(string='待换刀具名称', readonly="True") replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换刀具名称', readonly=True)
replacement_tool_type = fields.Char(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='粗/中/精', readonly="True") string='粗/中/精', readonly=True)
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly="True") new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
applicant = fields.Char(string='申请人', readonly="True") applicant = fields.Char(string='申请人', readonly=True)
used_tool_time = fields.Datetime(string='用刀时间', readonly="True") used_tool_time = fields.Datetime(string='用刀时间', readonly=True)
reason_for_applying = fields.Char(string='申请原因', readonly="True") reason_for_applying = fields.Char(string='申请原因', readonly=True)
remark = fields.Char(string='备注说明', readonly="True") remark = fields.Char(string='备注说明', readonly=False)
status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移')], string='操作状态', default='0') status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移')], string='操作状态', default='0')
@api.depends('functional_tool_name_id')
def _compute_functional_tool_name_id(self):
for record in self:
if record:
record.functional_tool_code = record.functional_tool_name_id.code
record.functional_tool_type_id = record.functional_tool_name_id.mrs_cutting_tool_type_id.id
@api.onchange('functional_tool_status') @api.onchange('functional_tool_status')
def automation_apply_for_tool_change(self): def automation_apply_for_tool_change(self):
""" """
@@ -335,10 +341,10 @@ class MachineTableToolChangingApply(models.Model):
# todo 自动换刀申请条件需补充完善 # todo 自动换刀申请条件需补充完善
if(self.functional_tool_status == '异常'): if(self.functional_tool_status == '异常'):
self.env['sf.machine.table.tool.changing.apply'].search([ self.env['sf.machine.table.tool.changing.apply'].search([
('name', '=', self.name)]).write({ ('name', '=', self.name.id)]).write({
'replacement_tool_code': self.functional_tool_code, 'replacement_tool_code': self.functional_tool_code,
'replacement_tool_name': self.functional_tool_name, 'replacement_tool_name_id': self.functional_tool_name_id.id,
'replacement_tool_type': self.functional_tool_type, 'replacement_tool_type_id': self.functional_tool_type_id.id,
'replacement_tool_coarse_middle_thin': self.coarse_middle_thin, 'replacement_tool_coarse_middle_thin': self.coarse_middle_thin,
'new_former': '0', 'new_former': '0',
'applicant': '自动申请', 'applicant': '自动申请',
@@ -351,8 +357,8 @@ class MachineTableToolChangingApply(models.Model):
# 新建组装任务 # 新建组装任务
self.env['sf.functional.tool.assembly'].create({ 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, 'name': self.functional_tool_name_id,
'functional_tool_type': self.functional_tool_type, 'functional_tool_type_id': self.functional_tool_type_id.id,
'functional_tool_diameter': self.diameter, 'functional_tool_diameter': self.diameter,
'loading_task_source': '1', 'loading_task_source': '1',
'applicant': '自动申请', 'applicant': '自动申请',
@@ -384,11 +390,16 @@ class MachineTableToolChangingApply(models.Model):
换刀申请撤回按键 换刀申请撤回按键
:return: :return:
""" """
# 撤回功能刀具组装创建的任务
self.env['sf.functional.tool.assembly'].search(
[('functional_tool_code', '=', self.replacement_tool_code),
('loading_task_source', '=', '机台换刀')]).unlink()
# 撤回数据更新 # 撤回数据更新
self.env['sf.machine.table.tool.changing.apply'].search([('name', '=', self.name)]).write({ self.env['sf.machine.table.tool.changing.apply'].search([('name', '=', self.name.id)]).write({
'replacement_tool_code': None, 'replacement_tool_code': None,
'replacement_tool_name': None, 'replacement_tool_name_id': None,
'replacement_tool_type': None, 'replacement_tool_type_id': None,
'replacement_tool_coarse_middle_thin': None, 'replacement_tool_coarse_middle_thin': None,
'new_former': None, 'new_former': None,
'applicant': None, 'applicant': None,
@@ -398,10 +409,6 @@ class MachineTableToolChangingApply(models.Model):
'status': '0' 'status': '0'
}) })
# 撤回功能刀具组装创建新任务
self.env['sf.functional.tool.assembly'].search(
[('functional_tool_code', '=', self.functional_tool_code)]).unlink()
def revocation_2(self): def revocation_2(self):
""" """
@@ -409,7 +416,7 @@ class MachineTableToolChangingApply(models.Model):
:return: :return:
""" """
self.env['sf.machine.table.tool.changing.apply'].search( self.env['sf.machine.table.tool.changing.apply'].search(
[('name', '=', self.name)]).write({ [('name', '=', self.name.id)]).write({
'status': '0' 'status': '0'
}) })
@@ -418,38 +425,38 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
_name = 'sf.cam.work.order.program.knife.plan' _name = 'sf.cam.work.order.program.knife.plan'
_description = 'CAM工单程序用刀计划' _description = 'CAM工单程序用刀计划'
name = fields.Char(string='工单任务编号', readonly=True) name = fields.Char(string='工单任务编号', readonly=False)
cam_procedure_code = fields.Char(string='CAM程序编号', readonly=True) cam_procedure_code = fields.Char(string='CAM程序编号', readonly=False)
cam_cutter_spacing_code = fields.Char(string='CAM刀位号', readonly=True) cam_cutter_spacing_code = fields.Char(string='CAM刀位号', readonly=False)
functional_tool_code = fields.Char(string='功能刀具编码', readonly=True) functional_tool_code = fields.Char(string='功能刀具编码', readonly=False)
functional_tool_name = fields.Char(string='功能刀具名称', readonly=True) functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False)
functional_tool_type = fields.Char(string='功能刀具类型', readonly=True) functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False)
machine_table_name = fields.Char(string='机床名称', readonly=True) machine_table_name_id = fields.Many2one('sf.machine_tool', string='机床名称', readonly=False)
machine_tool_cutter_spacing_code = fields.Char(string='机床刀位号', readonly=True) machine_tool_cutter_spacing_code = fields.Char(string='机床刀位号', readonly=False)
diameter = fields.Char(string='直径（程式）', readonly=True) diameter = fields.Char(string='直径（程式）', readonly=False)
tool_loading_length = fields.Char(string='装刀长', readonly=True) tool_loading_length = fields.Char(string='装刀长', readonly=False)
clearance_length = fields.Char(string='避空长', readonly=True) clearance_length = fields.Char(string='避空长', readonly=False)
tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=True) tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=False)
L_D = fields.Char(string='L/D', readonly=True) L_D = fields.Char(string='L/D', readonly=False)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True) coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False)
required_cutting_time = fields.Char(string='需要切割时间', readonly=True) required_cutting_time = fields.Char(string='需要切割时间', readonly=False)
whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=True) whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=False)
need_knife_time = fields.Datetime(string='需要用刀时间', readonly=True) need_knife_time = fields.Datetime(string='需要用刀时间', readonly=False)
plan_execute_status = fields.Selection([('0', '待下发'), ('1', '执行中'), ('2', '已完成')], plan_execute_status = fields.Selection([('0', '待下发'), ('1', '执行中'), ('2', '已完成')],
string='计划执行状态', default='0', readonly=True) string='计划执行状态', default='0', readonly=False)
applicant = fields.Char(string='申请人', readonly=True) applicant = fields.Char(string='申请人', readonly=False)
reason_for_applying = fields.Char(string='申请原因', readonly=True) reason_for_applying = fields.Char(string='申请原因', readonly=False)
remark = fields.Char(string='备注说明', readonly=True) remark = fields.Char(string='备注说明', readonly=False)
def automation_apply_for_tooling(self): def apply_for_tooling(self):
""" """
自动申请装刀 申请装刀
:return: :return:
""" """
self.env['sf.functional.tool.assembly'].create({ 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, 'name': self.functional_tool_name_id.id,
'functional_tool_type': self.functional_tool_type, 'functional_tool_type_id': self.functional_tool_type_id.id,
'functional_tool_diameter': self.diameter, 'functional_tool_diameter': self.diameter,
'functional_tool_length': self.tool_loading_length, 'functional_tool_length': self.tool_loading_length,
'loading_task_source': '0', 'loading_task_source': '0',
@@ -458,7 +465,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
'applicant': self.applicant, 'applicant': self.applicant,
'reason_for_applying': self.reason_for_applying, 'reason_for_applying': self.reason_for_applying,
'use_tool_time': self.need_knife_time, 'use_tool_time': self.need_knife_time,
'machine_tool_name': self.machine_table_name, '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
}) })
@@ -467,13 +474,15 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
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({'plan_execute_status': '1'})
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)]).unlink() [('functional_tool_code', '=', self.functional_tool_code),
('loading_task_source', '=', 'CAM装刀')]).unlink()
# 将计划执行状态改为待执行 # 将计划执行状态改为待执行
self.env['sf.cam.work.order.program.knife.plan'].search( self.env['sf.cam.work.order.program.knife.plan'].search(
@@ -489,25 +498,25 @@ class FunctionalToolAssembly(models.Model):
_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.Char(string='功能刀具名称', readonly=True) name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True)
functional_tool_type = fields.Char(string='功能刀具类型', readonly=True) functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
functional_tool_diameter = fields.Char(string='功能刀具直径', readonly=True) functional_tool_diameter = fields.Char(string='功能刀具直径', readonly=True)
functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True) functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True)
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=True) functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
tool_name = fields.Char(string='刀具名称', readonly=True) tool_name = fields.Char(string='刀具名称', readonly=False)
tool_brand = fields.Char(string='品牌', readonly=True) tool_brand = fields.Char(string='品牌', readonly=False)
tool_type = fields.Char(string='型号', readonly=True) tool_type = fields.Char(string='型号', readonly=False)
knife_handle_name = fields.Char(string='刀柄名称', readonly=True) knife_handle_name = fields.Char(string='刀柄名称', readonly=False)
knife_handle_brand = fields.Char(string='品牌', readonly=True) knife_handle_brand = fields.Char(string='品牌', readonly=False)
knife_handle_type = fields.Char(string='型号', readonly=True) knife_handle_type = fields.Char(string='型号', readonly=False)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True) coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False)
tool_loading_length = fields.Char(string='装刀长', readonly=True) tool_loading_length = fields.Char(string='装刀长', readonly=False)
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True) new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=False)
reference_length = fields.Char(string='参考伸出长', readonly=True) reference_length = fields.Char(string='参考伸出长', readonly=False)
cut_time = fields.Char(string='已切削时间', readonly=True) cut_time = fields.Char(string='已切削时间', readonly=False)
cut_length = fields.Char(string='已切削长度', readonly=True) cut_length = fields.Char(string='已切削长度', readonly=False)
cut_number = fields.Char(string='已切削次数', readonly=True) cut_number = fields.Char(string='已切削次数', readonly=False)
loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀')], string='装刀任务来源', readonly=True) loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀')], string='装刀任务来源', readonly=True)
applicant = fields.Char(string='申请人', readonly=True) applicant = fields.Char(string='申请人', readonly=True)
@@ -515,8 +524,8 @@ class FunctionalToolAssembly(models.Model):
apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True) apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True)
assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装'), ('2', '已出库')],string='组装状态', default='0', readonly=True) assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装'), ('2', '已出库')],string='组装状态', default='0', readonly=True)
use_tool_time = fields.Datetime(string='用刀时间', readonly=True) use_tool_time = fields.Datetime(string='用刀时间', readonly=True)
production_line_name = fields.Char(string='产线名称', readonly=True) production_line_name = fields.Char(string='产线名称', readonly=False)
machine_tool_name = fields.Char(string='机床名称', readonly=True) machine_tool_name_id = fields.Many2one('sf.machine_tool', string='机床名称', 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)
@@ -526,7 +535,7 @@ class FunctionalToolAssembly(models.Model):
receive_time = fields.Datetime(string='领用出库时间', readonly=True) receive_time = fields.Datetime(string='领用出库时间', readonly=True)
remark = fields.Char(string='备注说明', readonly=True) remark = fields.Char(string='备注说明', readonly=True)
check_box_1 = fields.Boolean(string='复选框', default=False, readonly=True) check_box_1 = fields.Boolean(string='复选框', default=False, readonly=False)
@api.onchange('assemble_status') @api.onchange('assemble_status')
def check_box(self): def check_box(self):
@@ -540,7 +549,7 @@ class FunctionalToolAssembly(models.Model):
:return: :return:
""" """
self.env['sf.functional.tool.assembly'].search([ self.env['sf.functional.tool.assembly'].search([
('machine_tool_name', '=', self.machine_tool_name), ('machine_tool_name_id', '=', self.machine_tool_name_id.id),
('cutter_spacing_code', '=', self.cutter_spacing_code) ('cutter_spacing_code', '=', self.cutter_spacing_code)
]).write({ ]).write({
'tool_name': None, 'tool_name': None,
@@ -575,8 +584,8 @@ class FunctionalToolAssembly(models.Model):
for val in vals: for val in vals:
self.env['sf.delivery.of.cargo.from.storage'].create({ self.env['sf.delivery.of.cargo.from.storage'].create({
'functional_tool_code': val.functional_tool_code, 'functional_tool_code': val.functional_tool_code,
'name': val.name, 'name': val.name.id,
'functional_tool_type': val.functional_tool_type, 'functional_tool_type_id': val.functional_tool_type_id.id,
'production_line_name': val.production_line_name, 'production_line_name': val.production_line_name,
'machine_tool_code': val.machine_tool_code, 'machine_tool_code': val.machine_tool_code,
'receive_person': val.receive_person, 'receive_person': val.receive_person,
@@ -585,8 +594,8 @@ class FunctionalToolAssembly(models.Model):
else: else:
self.env['sf.delivery.of.cargo.from.storage'].create({ self.env['sf.delivery.of.cargo.from.storage'].create({
'functional_tool_code': self.functional_tool_code, 'functional_tool_code': self.functional_tool_code,
'name': self.name, 'name': self.name.id,
'functional_tool_type': self.functional_tool_type, 'functional_tool_type_id': self.functional_tool_type_id.id,
'production_line_name': self.production_line_name, 'production_line_name': self.production_line_name,
'machine_tool_code': self.machine_tool_code, 'machine_tool_code': self.machine_tool_code,
'receive_person': self.receive_person, 'receive_person': self.receive_person,

1
sf_tool_management/security/ir.model.access.csv
View File

@@ -10,7 +10,6 @@ access_sf_machine_table_tool_changing_apply,sf.machine.table.tool.changing.apply
access_sf_tool_change_requirement_information,sf.tool.change.requirement.information,model_sf_tool_change_requirement_information,base.group_user,1,1,1,1 access_sf_tool_change_requirement_information,sf.tool.change.requirement.information,model_sf_tool_change_requirement_information,base.group_user,1,1,1,1
access_sf_tool_transfer_request_information,sf.tool.transfer.request.information,model_sf_tool_transfer_request_information,base.group_user,1,1,1,1 access_sf_tool_transfer_request_information,sf.tool.transfer.request.information,model_sf_tool_transfer_request_information,base.group_user,1,1,1,1
access_sf_apply_for_tooling,sf.apply.for.tooling,model_sf_apply_for_tooling,base.group_user,1,1,1,1
access_sf_functional_tool_assembly,sf.functional.tool.assembly,model_sf_functional_tool_assembly,base.group_user,1,1,1,1 access_sf_functional_tool_assembly,sf.functional.tool.assembly,model_sf_functional_tool_assembly,base.group_user,1,1,1,1
access_sf_functional_tool_assembly_order,sf.functional.tool.assembly.order,model_sf_functional_tool_assembly_order,base.group_user,1,1,1,1 access_sf_functional_tool_assembly_order,sf.functional.tool.assembly.order,model_sf_functional_tool_assembly_order,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
10 access_sf_apply_for_tooling access_sf_functional_tool_assembly sf.apply.for.tooling sf.functional.tool.assembly model_sf_apply_for_tooling model_sf_functional_tool_assembly base.group_user 1 1 1 1
11 access_sf_functional_tool_assembly access_sf_functional_tool_assembly_order sf.functional.tool.assembly sf.functional.tool.assembly.order model_sf_functional_tool_assembly model_sf_functional_tool_assembly_order base.group_user 1 1 1 1
12 access_sf_functional_tool_assembly_order access_sf_delivery_of_cargo_from_storage sf.functional.tool.assembly.order sf.delivery.of.cargo.from.storage model_sf_functional_tool_assembly_order model_sf_delivery_of_cargo_from_storage base.group_user 1 1 1 1
access_sf_delivery_of_cargo_from_storage sf.delivery.of.cargo.from.storage model_sf_delivery_of_cargo_from_storage base.group_user 1 1 1 1
13 access_sf_tool_material_search sf.tool.material.search model_sf_tool_material_search base.group_user 1 1 1 1
14
15

183
sf_tool_management/views/tool_base_views.xml
View File

@@ -536,16 +536,44 @@
<tree> <tree>
<field name="name"/> <field name="name"/>
<field name="machine_tool_code" invisible="1"/> <field name="machine_tool_code" invisible="1"/>
<field name="machine_table_type"/> <field name="machine_table_type_id"/>
<field name="cutter_spacing_code"/> <field name="cutter_spacing_code"/>
<field name="functional_tool_name"/> <field name="functional_tool_code"/>
<field name="functional_tool_type"/> <field name="functional_tool_name_id"/>
<field name="replacement_tool_code"/> <field name="replacement_tool_code"/>
<field name="replacement_tool_name"/> <field name="replacement_tool_name_id"/>
<field name="replacement_tool_type"/>
<field name="applicant"/> <field name="applicant"/>
<field name="used_tool_time"/>
<field name="remark"/> <field name="functional_tool_type_id" invisible="True"/>
<field name="coarse_middle_thin" invisible="True"/>
<field name="status" invisible="True"/>
<button string="换刀申请"
name="%(sf_tool_management.sf_tool_change_requirement_information_act)d"
type="action"
context="{ 'default_name':name,
'default_machine_tool_code': machine_tool_code,
'default_cutter_spacing_code': cutter_spacing_code,
'default_replacement_tool_code': functional_tool_code,
'default_replacement_tool_name_id': functional_tool_name_id,
'default_replacement_tool_type_id': functional_tool_type_id,
'default_replacement_tool_coarse_middle_thin': coarse_middle_thin}"
attrs="{'invisible': [('status', '!=', '0')]}"
class="btn-primary"
/>
<button string="转移"
name="%(sf_tool_management.sf_tool_transfer_request_information_act)d"
type="action"
context="{ 'default_CNC_machine_table_id':name,
'default_machine_tool_code': machine_tool_code,
'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_code': functional_tool_code,
'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type_id': functional_tool_type_id}"
class="btn-primary"
attrs="{'invisible': [('status', '!=', '0')]}"
/>
<button string="撤回换刀申请" name="revocation_1" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '1')]}"/>
<button string="撤回转移" name="revocation_2" type="object" class="btn-primary" attrs="{'invisible': [('status', '!=', '2')]}"/>
</tree> </tree>
</field> </field>
</record> </record>
@@ -563,8 +591,8 @@
'default_machine_tool_code': machine_tool_code, 'default_machine_tool_code': machine_tool_code,
'default_cutter_spacing_code': cutter_spacing_code, 'default_cutter_spacing_code': cutter_spacing_code,
'default_replacement_tool_code': functional_tool_code, 'default_replacement_tool_code': functional_tool_code,
'default_replacement_tool_name': functional_tool_name, 'default_replacement_tool_name_id': functional_tool_name_id,
'default_replacement_tool_type': functional_tool_type, 'default_replacement_tool_type_id': functional_tool_type_id,
'default_replacement_tool_coarse_middle_thin': coarse_middle_thin}" 'default_replacement_tool_coarse_middle_thin': coarse_middle_thin}"
attrs="{'invisible': [('status', '!=', '0')]}" attrs="{'invisible': [('status', '!=', '0')]}"
class="btn-primary" class="btn-primary"
@@ -572,12 +600,12 @@
<button string="转移" <button string="转移"
name="%(sf_tool_management.sf_tool_transfer_request_information_act)d" name="%(sf_tool_management.sf_tool_transfer_request_information_act)d"
type="action" type="action"
context="{ 'default_CNC_machine_table':name, context="{ 'default_CNC_machine_table_id':name,
'default_machine_tool_code': machine_tool_code, 'default_machine_tool_code': machine_tool_code,
'default_cutter_spacing_code': cutter_spacing_code, 'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_code': functional_tool_code, 'default_functional_tool_code': functional_tool_code,
'default_functional_tool_name': functional_tool_name, 'default_functional_tool_name_id': functional_tool_name_id,
'default_functional_tool_type': functional_tool_type}" 'default_functional_tool_type_id': functional_tool_type_id}"
class="btn-primary" class="btn-primary"
attrs="{'invisible': [('status', '!=', '0')]}" attrs="{'invisible': [('status', '!=', '0')]}"
/> />
@@ -588,14 +616,14 @@
<group string="基础信息"> <group string="基础信息">
<group> <group>
<field name="name"/> <field name="name"/>
<field name="machine_table_type"/> <field name="machine_table_type_id"/>
<field name="machine_tool_code" invisible="True"/> <field name="machine_tool_code" invisible="True"/>
<field name="cutter_spacing_code"/> <field name="cutter_spacing_code"/>
</group> </group>
<group> <group>
<field name="functional_tool_name"/>
<field name="functional_tool_type"/>
<field name="functional_tool_code"/> <field name="functional_tool_code"/>
<field name="functional_tool_name_id"/>
<field name="functional_tool_type_id"/>
</group> </group>
</group> </group>
<group string="数据信息"> <group string="数据信息">
@@ -614,8 +642,8 @@
</group> </group>
<group string="待换刀具信息"> <group string="待换刀具信息">
<group> <group>
<field name="replacement_tool_name"/> <field name="replacement_tool_name_id"/>
<field name="replacement_tool_type"/> <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"/>
<field name="status" invisible="True"/> <field name="status" invisible="True"/>
@@ -643,18 +671,16 @@
<search> <search>
<field name="name"/> <field name="name"/>
<field name="machine_tool_code" invisible="1"/> <field name="machine_tool_code" invisible="1"/>
<field name="machine_table_type"/> <field name="machine_table_type_id"/>
<field name="cutter_spacing_code"/> <field name="cutter_spacing_code"/>
<field name="functional_tool_name"/> <field name="functional_tool_code"/>
<field name="functional_tool_type"/> <field name="functional_tool_name_id"/>
<field name="replacement_tool_code"/> <field name="replacement_tool_code"/>
<field name="replacement_tool_name"/> <field name="replacement_tool_name_id"/>
<field name="replacement_tool_type"/>
<field name="applicant"/> <field name="applicant"/>
<field name="used_tool_time"/> <searchpanel>
<!-- <searchpanel>--> <field name="name" string="CNC机床" enable_counters="1" icon="fa-filter"/>
<!-- <field name="machine_table_type" string="机床类型" enable_counters="1"/>--> </searchpanel>
<!-- </searchpanel>-->
</search> </search>
</field> </field>
</record> </record>
@@ -677,12 +703,15 @@
<field name="name"/> <field name="name"/>
<field name="cam_procedure_code"/> <field name="cam_procedure_code"/>
<field name="cam_cutter_spacing_code"/> <field name="cam_cutter_spacing_code"/>
<field name="functional_tool_name"/> <field name="machine_table_name_id"/>
<field name="functional_tool_type"/> <field name="functional_tool_name_id"/>
<field name="machine_table_name"/> <field name="functional_tool_type_id"/>
<field name="machine_tool_cutter_spacing_code"/> <field name="machine_tool_cutter_spacing_code"/>
<field name="applicant"/> <field name="applicant"/>
<field name="remark"/> <field name="remark" optional="hide"/>
<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="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
</tree> </tree>
</field> </field>
</record> </record>
@@ -693,30 +722,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form> <form>
<header> <header>
<button string="申请装刀" <button string="申请装刀" name="apply_for_tooling" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '0')]}" confirm="是否确认申请装刀"/>
name="%(sf_tool_management.sf_apply_for_tooling_act)d"
type="action"
context="{ 'default_name':name,
'default_cam_procedure_code': cam_procedure_code,
'default_machine_table_name': machine_table_name,
'default_cam_cutter_spacing_code': cam_cutter_spacing_code,
'default_functional_tool_code': functional_tool_code,
'default_functional_tool_name': functional_tool_name,
'default_functional_tool_type': functional_tool_type,
'default_diameter': diameter,
'default_tool_loading_length': tool_loading_length,
'default_clearance_length': clearance_length,
'default_tool_included_angle': tool_included_angle,
'default_L_D': L_D,
'default_coarse_middle_thin': coarse_middle_thin,
'default_whether_standard_tool': whether_standard_tool,
'default_need_knife_time': need_knife_time,
'default_applicant': applicant,
'default_required_cutting_time': required_cutting_time,
'default_reason_for_applying': reason_for_applying}"
class="btn-primary"
attrs="{'invisible': [('plan_execute_status', '!=', '0')]}"
/>
<button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/> <button string="撤回" name="revocation" type="object" class="btn-primary" attrs="{'invisible': [('plan_execute_status', '!=', '1')]}"/>
</header> </header>
@@ -726,12 +732,12 @@
<field name="name"/> <field name="name"/>
<field name="cam_procedure_code"/> <field name="cam_procedure_code"/>
<field name="cam_cutter_spacing_code"/> <field name="cam_cutter_spacing_code"/>
<field name="machine_table_name"/> <field name="machine_table_name_id"/>
</group> </group>
<group> <group>
<field name="functional_tool_code"/> <field name="functional_tool_code"/>
<field name="functional_tool_name"/> <field name="functional_tool_name_id"/>
<field name="functional_tool_type"/> <field name="functional_tool_type_id"/>
<field name="machine_tool_cutter_spacing_code"/> <field name="machine_tool_cutter_spacing_code"/>
</group> </group>
</group> </group>
@@ -770,11 +776,14 @@
<field name="name"/> <field name="name"/>
<field name="cam_procedure_code"/> <field name="cam_procedure_code"/>
<field name="cam_cutter_spacing_code"/> <field name="cam_cutter_spacing_code"/>
<field name="functional_tool_name"/> <field name="machine_table_name_id"/>
<field name="functional_tool_type"/> <field name="functional_tool_name_id"/>
<field name="machine_table_name"/> <field name="functional_tool_type_id"/>
<field name="machine_tool_cutter_spacing_code"/> <field name="machine_tool_cutter_spacing_code"/>
<field name="applicant"/> <field name="applicant"/>
<searchpanel>
<field name="machine_table_name_id" string="CNC机床" enable_counters="1" icon="fa-filter"/>
</searchpanel>
</search> </search>
</field> </field>
</record> </record>
@@ -795,14 +804,40 @@
<tree> <tree>
<field name="functional_tool_code"/> <field name="functional_tool_code"/>
<field name="name"/> <field name="name"/>
<field name="functional_tool_type"/> <field name="functional_tool_type_id"/>
<field name="loading_task_source"/> <field name="loading_task_source" optional="hide"/>
<field name="applicant"/> <field name="applicant"/>
<field name="assemble_status"/> <field name="assemble_status" optional="hide"/>
<field name="use_tool_time" /> <field name="use_tool_time" />
<field name="receive_person"/> <field name="receive_person"/>
<field name="receive_time"/> <field name="receive_time"/>
<field name="remark"/> <field name="remark" optional="hide"/>
<field name="machine_tool_name_id" invisible="True"/>
<field name="cutter_spacing_code" invisible="True"/>
<field name="functional_tool_length" invisible="True"/>
<field name="functional_tool_diameter" invisible="True"/>
<field name="functional_tool_cutting_type" invisible="True"/>
<button string="组装"
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
type="action"
context="{
'default_machine_tool_name_id': machine_tool_name_id,
'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_name_id': name,
'default_functional_tool_type_id': functional_tool_type_id,
'default_functional_tool_length': functional_tool_length,
'default_effective_length': None,
'default_functional_tool_diameter': functional_tool_diameter,
'default_tool_included_angle': None,
'default_functional_tool_cutting_type': functional_tool_cutting_type,
'default_required_cutting_time': None,
'default_whether_standard_tool': None}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
<button string="取消组装" name="cancel_functional_tool_assembly" 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"/>
</tree> </tree>
</field> </field>
</record> </record>
@@ -817,10 +852,10 @@
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d" name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
type="action" type="action"
context="{ context="{
'default_machine_tool_name': machine_tool_name, 'default_machine_tool_name_id': machine_tool_name_id,
'default_cutter_spacing_code': cutter_spacing_code, 'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_name': name, 'default_functional_tool_name_id': name,
'default_functional_tool_type': functional_tool_type, 'default_functional_tool_type_id': functional_tool_type_id,
'default_functional_tool_length': functional_tool_length, 'default_functional_tool_length': functional_tool_length,
'default_effective_length': None, 'default_effective_length': None,
'default_functional_tool_diameter': functional_tool_diameter, 'default_functional_tool_diameter': functional_tool_diameter,
@@ -844,7 +879,7 @@
<group> <group>
<field name="functional_tool_code"/> <field name="functional_tool_code"/>
<field name="name"/> <field name="name"/>
<field name="functional_tool_type"/> <field name="functional_tool_type_id"/>
</group> </group>
<group> <group>
<field name="functional_tool_diameter"/> <field name="functional_tool_diameter"/>
@@ -874,7 +909,7 @@
<group string="申请信息"> <group string="申请信息">
<group> <group>
<field name="production_line_name"/> <field name="production_line_name"/>
<field name="machine_tool_name"/> <field name="machine_tool_name_id"/>
<field name="machine_tool_code"/> <field name="machine_tool_code"/>
<field name="cutter_spacing_code"/> <field name="cutter_spacing_code"/>
<field name="applicant"/> <field name="applicant"/>
@@ -914,14 +949,17 @@
<search> <search>
<field name="functional_tool_code"/> <field name="functional_tool_code"/>
<field name="name"/> <field name="name"/>
<field name="functional_tool_type"/> <field name="functional_tool_type_id"/>
<field name="loading_task_source"/> <field name="loading_task_source"/>
<field name="applicant"/> <field name="applicant"/>
<field name="assemble_status"/> <field name="assemble_status"/>
<field name="use_tool_time" /> <field name="use_tool_time"/>
<field name="receive_person"/> <field name="receive_person"/>
<field name="receive_time"/> <field name="receive_time"/>
<field name="remark"/> <field name="remark"/>
<searchpanel>
<field name="functional_tool_type_id" enable_counters="1" icon="fa-filter"/>
</searchpanel>
</search> </search>
</field> </field>
</record> </record>
@@ -932,8 +970,5 @@
<field name="res_model">sf.functional.tool.assembly</field> <field name="res_model">sf.functional.tool.assembly</field>
<field name="view_mode">tree,form,search</field> <field name="view_mode">tree,form,search</field>
</record> </record>
</data> </data>
</odoo> </odoo>

104
sf_tool_management/wizard/wizard.py
View File

@@ -7,17 +7,17 @@ class ToolChangeRequirementInformation(models.TransientModel):
# tool_change_to_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', string='机床换刀申请') # tool_change_to_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', string='机床换刀申请')
name = fields.Char(string='CNC机床', readonly=True) name = fields.Many2one('sf.machine_tool', 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)
replacement_tool_code = fields.Char(string='待换刀具编码') replacement_tool_code = fields.Char(string='待换刀具编码')
replacement_tool_name = fields.Char(string='待换刀具名称') replacement_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='待换刀具名称')
replacement_tool_type = fields.Char(string='待换刀具类型') replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换刀具类型')
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='新/旧')
applicant = fields.Char(string='申请人') applicant = fields.Char(string='申请人', default=lambda self: self.env.user.name, readonly=True)
used_tool_time = fields.Datetime(string='用刀时间') used_tool_time = fields.Datetime(string='用刀时间')
reason_for_applying = fields.Char(string='申请原因') reason_for_applying = fields.Char(string='申请原因')
remark = fields.Char(string='备注说明') remark = fields.Char(string='备注说明')
@@ -29,12 +29,12 @@ class ToolChangeRequirementInformation(models.TransientModel):
""" """
# 封装数据 # 封装数据
desc = { desc = {
'name': self.name, 'name': self.name.id,
'machine_tool_code': self.machine_tool_code, 'machine_tool_code': self.machine_tool_code,
'cutter_spacing_code': self.cutter_spacing_code, 'cutter_spacing_code': self.cutter_spacing_code,
'replacement_tool_code': self.replacement_tool_code, 'replacement_tool_code': self.replacement_tool_code,
'replacement_tool_name': self.replacement_tool_name, 'replacement_tool_name_id': self.replacement_tool_name_id.id,
'replacement_tool_type': self.replacement_tool_type, 'replacement_tool_type_id': self.replacement_tool_type_id.id,
'replacement_tool_coarse_middle_thin': self.replacement_tool_coarse_middle_thin, 'replacement_tool_coarse_middle_thin': self.replacement_tool_coarse_middle_thin,
'new_former': self.new_former, 'new_former': self.new_former,
'applicant': self.applicant, 'applicant': self.applicant,
@@ -51,13 +51,13 @@ class ToolChangeRequirementInformation(models.TransientModel):
# 功能刀具组装创建新任务 # 功能刀具组装创建新任务
self.env['sf.machine.table.tool.changing.apply'].new_assembly_task({ self.env['sf.machine.table.tool.changing.apply'].new_assembly_task({
'functional_tool_code': self.replacement_tool_code, 'functional_tool_code': self.replacement_tool_code,
'name': self.replacement_tool_name, 'name': self.replacement_tool_name_id.id,
'functional_tool_type': self.replacement_tool_type, 'functional_tool_type_id': self.replacement_tool_type_id.id,
'loading_task_source': '1', 'loading_task_source': '1',
'applicant': self.applicant, 'applicant': self.applicant,
'reason_for_applying': self.reason_for_applying, 'reason_for_applying': self.reason_for_applying,
'use_tool_time': self.used_tool_time, 'use_tool_time': self.used_tool_time,
'machine_tool_name': self.name, 'machine_tool_name_id': self.name.id,
'machine_tool_code': self.machine_tool_code, 'machine_tool_code': self.machine_tool_code,
'cutter_spacing_code': self.cutter_spacing_code 'cutter_spacing_code': self.cutter_spacing_code
}) })
@@ -70,18 +70,18 @@ class ToolTransferRequestInformation(models.TransientModel):
_name = 'sf.tool.transfer.request.information' _name = 'sf.tool.transfer.request.information'
_description = '刀具转移申请信息' _description = '刀具转移申请信息'
CNC_machine_table = fields.Char(string='CNC机床', readonly=True) CNC_machine_table_id = fields.Many2one('sf.machine_tool', 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_code = fields.Char(string='功能刀具编码', readonly=True)
functional_tool_name = fields.Char(string='功能刀具名称', readonly=True) functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True)
# todo 功能刀具类型为 Many2one # todo 功能刀具类型为 Many2one
functional_tool_type = fields.Char(string='功能刀具类型', readonly=True) functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
transfer_target = fields.Selection([('机台', '机台'), transfer_target = fields.Selection([('机台', '机台'),
('线边刀库', '线边刀库'), ('线边刀库', '线边刀库'),
('刀具房', '刀具房')], string='转移到:', default='线边刀库') ('刀具房', '刀具房')], string='转移到:', default='线边刀库')
new_cnc_machine_table = fields.Char(string='机床名称') new_cnc_machine_table_id = fields.Many2one('sf.machine_tool', string='机床名称')
new_machine_tool_code = fields.Char(string='机床号') new_machine_tool_code = fields.Char(string='机床号')
new_cutter_spacing_code = fields.Char(string='刀位号') new_cutter_spacing_code = fields.Char(string='刀位号')
@@ -97,63 +97,7 @@ class ToolTransferRequestInformation(models.TransientModel):
:return: :return:
""" """
self.env['sf.machine.table.tool.changing.apply'].search( self.env['sf.machine.table.tool.changing.apply'].search(
[('CNC_machine_table', '=', self.CNC_machine_table)]).write({'status': '2'}) [('name', '=', self.CNC_machine_table_id.id)]).write({'status': '2'})
class ApplyForTooling(models.TransientModel):
_name = 'sf.apply.for.tooling'
_description = '申请装刀'
ticket_task_code = fields.Char(string='工单任务编号', readonly=True)
cam_procedure_code = fields.Char(string='CAM程序编号', readonly=True)
machine_table_name = fields.Char(string='机床名称', readonly=True)
cam_cutter_spacing_code = fields.Char(string='CAM刀位号', readonly=True)
functional_tool_code = fields.Char(string='功能刀具编码', readonly=True)
functional_tool_name = fields.Char(string='功能刀具名称', readonly=True)
functional_tool_type = fields.Char(string='功能刀具类型', readonly=True)
diameter = fields.Char(string='直径（程式）', readonly=True)
tool_loading_length = fields.Char(string='装刀长', readonly=True)
clearance_length = fields.Char(string='避空长', readonly=True)
tool_included_angle = fields.Char(string='刀尖角（R角）', readonly=True)
L_D = fields.Char(string='L/D', readonly=True)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=True)
need_knife_time = fields.Datetime(string='需要用刀时间', readonly=True)
required_cutting_time = fields.Char(string='需要切割时间', readonly=True)
reason_for_applying = fields.Char(string='申请原因', readonly=True)
applicant = fields.Char(string='申请人', invisible='1')
def apply_for_tooling(self):
"""
申请装刀
:return:
"""
self.env['sf.functional.tool.assembly'].create({
'functional_tool_code': self.functional_tool_code,
'name': self.functional_tool_name,
'functional_tool_type': self.functional_tool_type,
'functional_tool_diameter': self.diameter,
'functional_tool_length': self.tool_loading_length,
'loading_task_source': '0',
'coarse_middle_thin': None,
'tool_loading_length': None,
'applicant': self.applicant,
'reason_for_applying': self.reason_for_applying,
'use_tool_time': self.need_knife_time,
'machine_tool_name': self.machine_table_name,
'machine_tool_code': self.cam_procedure_code,
'cutter_spacing_code': self.cam_cutter_spacing_code
})
# 将计划执行状态改为执行中
self.env['sf.cam.work.order.program.knife.plan'].search(
[('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '1'})
# 关闭弹出窗口
return {'type': 'ir.actions.act_window_close'}
class FunctionalToolAssemblyOrder(models.TransientModel): class FunctionalToolAssemblyOrder(models.TransientModel):
@@ -161,10 +105,10 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
_description = '功能刀具组装单' _description = '功能刀具组装单'
# 功能刀具申请信息 # 功能刀具申请信息
machine_tool_name = fields.Char(string='机床名称', readonly=True) machine_tool_name_id = fields.Many2one('sf.machine_tool', string='机床名称', readonly=True)
cutter_spacing_code = fields.Char(string='刀位号', readonly=True) cutter_spacing_code = fields.Char(string='刀位号', readonly=True)
functional_tool_name = fields.Char(string='功能刀具名称', readonly=True) functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True)
functional_tool_type = fields.Char(string='功能刀具类型', readonly=True) functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True)
functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True) functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True)
effective_length = fields.Char(string='有效长', readonly=True) effective_length = fields.Char(string='有效长', readonly=True)
functional_tool_diameter = fields.Char(string='功能刀具直径', readonly=True) functional_tool_diameter = fields.Char(string='功能刀具直径', readonly=True)
@@ -196,7 +140,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
:return: :return:
""" """
self.env['sf.functional.tool.assembly'].search([ self.env['sf.functional.tool.assembly'].search([
('machine_tool_name', '=', self.machine_tool_name), ('machine_tool_name_id', '=', self.machine_tool_name_id.id),
('cutter_spacing_code', '=', self.cutter_spacing_code) ('cutter_spacing_code', '=', self.cutter_spacing_code)
]).write({ ]).write({
'tool_name': self.tool_name, 'tool_name': self.tool_name,
@@ -227,8 +171,8 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
order = fields.Integer(string='序') order = fields.Integer(string='序')
functional_tool_code = fields.Char(string='功能刀具编码') functional_tool_code = fields.Char(string='功能刀具编码')
name = fields.Char(string='功能刀具名称') name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称')
functional_tool_type = fields.Char(string='功能刀具类型') functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
production_line_name = fields.Char(string='产线名称') production_line_name = fields.Char(string='产线名称')
machine_tool_code = fields.Char(string='机台号') machine_tool_code = fields.Char(string='机台号')
receive_person = fields.Char(string='领用人') receive_person = fields.Char(string='领用人')
@@ -244,7 +188,7 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
for val in vals: for val in vals:
self.env['sf.functional.tool.assembly'].search([ self.env['sf.functional.tool.assembly'].search([
('functional_tool_code', '=', val.functional_tool_code), ('functional_tool_code', '=', val.functional_tool_code),
('name', '=', val.name) ('name', '=', val.name.id)
]).write({ ]).write({
'assemble_status': '2', 'assemble_status': '2',
'receive_person': self.env.user.name, 'receive_person': self.env.user.name,
@@ -253,13 +197,13 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
tool_assembly = self.env['sf.functional.tool.assembly'].search([ tool_assembly = self.env['sf.functional.tool.assembly'].search([
('functional_tool_code', '=', val.functional_tool_code), ('functional_tool_code', '=', val.functional_tool_code),
('name', '=', val.name) ('name', '=', val.name.id)
]) ])
# 判断装刀任务来源，如果来源于CAM装刀，则修改CAM装刀的计划执行状态 # 判断装刀任务来源，如果来源于CAM装刀，则修改CAM装刀的计划执行状态
if tool_assembly.loading_task_source == '0': if tool_assembly.loading_task_source == '0':
self.env['sf.cam.work.order.program.knife.plan'].search([ self.env['sf.cam.work.order.program.knife.plan'].search([
('functional_tool_code', '=', val.functional_tool_code), ('functional_tool_code', '=', val.functional_tool_code),
('functional_tool_name', '=', val.name) ('functional_tool_name_id', '=', val.name.id)
]).write({ ]).write({
'plan_execute_status': '2' 'plan_execute_status': '2'
}) })

97
sf_tool_management/wizard/wizard_view.xml
View File

@@ -20,25 +20,17 @@
</group> </group>
<group string="刀具信息"> <group string="刀具信息">
<group> <group>
<field name="replacement_tool_name"/> <field name="replacement_tool_name_id"/>
</group> <field name="replacement_tool_code"/>
<group>
<field name="replacement_tool_type"/>
</group>
</group>
<group>
<group>
<field name="replacement_tool_coarse_middle_thin"/> <field name="replacement_tool_coarse_middle_thin"/>
<field name="used_tool_time"/>
</group>
<group>
<field name="new_former"/>
<field name="applicant"/> <field name="applicant"/>
</group> </group>
</group>
<group>
<group> <group>
<field name="replacement_tool_type_id"/>
<field name="used_tool_time"/>
<field name="new_former"/>
<field name="reason_for_applying"/> <field name="reason_for_applying"/>
</group> </group>
</group> </group>
</sheet> </sheet>
@@ -69,7 +61,7 @@
<sheet> <sheet>
<group string="机床信息"> <group string="机床信息">
<group> <group>
<field name="CNC_machine_table"/> <field name="CNC_machine_table_id"/>
<field name="cutter_spacing_code"/> <field name="cutter_spacing_code"/>
</group> </group>
<group> <group>
@@ -78,8 +70,8 @@
</group> </group>
<group string="刀具信息"> <group string="刀具信息">
<group> <group>
<field name="functional_tool_name" string="刀具名称"/> <field name="functional_tool_name_id" string="刀具名称"/>
<field name="functional_tool_type" string="刀具类型"/> <field name="functional_tool_type_id" string="刀具类型"/>
</group> </group>
<group> <group>
<field name="functional_tool_code" string="刀具编码"/> <field name="functional_tool_code" string="刀具编码"/>
@@ -92,7 +84,7 @@
</group> </group>
<group> <group>
<group> <group>
<field name="new_cnc_machine_table" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/> <field name="new_cnc_machine_table_id" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
<field name="new_machine_tool_code" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/> <field name="new_machine_tool_code" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
<field name="new_cutter_spacing_code" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/> <field name="new_cutter_spacing_code" attrs="{'invisible': [('transfer_target', '!=', '机台')]}"/>
<field name="magazine_tool_warehouse_district" attrs="{'invisible': [('transfer_target', '!=', '线边刀库')]}"/> <field name="magazine_tool_warehouse_district" attrs="{'invisible': [('transfer_target', '!=', '线边刀库')]}"/>
@@ -120,67 +112,6 @@
</record> </record>
<!--================================================申请装刀================================================-->
<record id="sf_apply_for_tooling_form" model="ir.ui.view">
<field name="name">申请装刀</field>
<field name="model">sf.apply.for.tooling</field>
<field name="arch" type="xml">
<form string="申请装刀">
<sheet>
<group string="基础信息">
<group>
<field name="ticket_task_code" string="工单编号"/>
</group>
</group>
<group>
<group>
<field name="machine_table_name" string="CAM指定机床"/>
<field name="cam_procedure_code" string="CAM程序编号"/>
<field name="cam_cutter_spacing_code" string="CAM指定刀位号"/>
</group>
<group>
<field name="functional_tool_name"/>
<field name="functional_tool_code"/>
<field name="functional_tool_type"/>
</group>
</group>
<group string="数据信息">
<group>
<field name="diameter" string="直径"/>
<field name="tool_included_angle" string="刀尖角"/>
<field name="clearance_length"/>
<field name="need_knife_time"/>
<field name="whether_standard_tool"/>
</group>
<group>
<field name="tool_loading_length"/>
<field name="L_D"/>
<field name="coarse_middle_thin"/>
<field name="required_cutting_time" string="需切削时长"/>
</group>
</group>
<group string="其他">
<field name="reason_for_applying"/>
</group>
</sheet>
<footer>
<button string="确定" name="apply_for_tooling" type="object" class="btn-primary" confirm="是否确认申请装刀"/>
<button string="取消" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
</record>
<record id="sf_apply_for_tooling_act" model="ir.actions.act_window">
<field name="name">申请装刀</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.apply.for.tooling</field>
<field name="view_mode">form</field>
<field name="view_id" ref="sf_apply_for_tooling_form"/>
<field name="target">new</field>
</record>
<!--================================================功能刀具组装单================================================--> <!--================================================功能刀具组装单================================================-->
<record id="sf_functional_tool_assembly_order_form" model="ir.ui.view"> <record id="sf_functional_tool_assembly_order_form" model="ir.ui.view">
<field name="name">功能刀具组装单</field> <field name="name">功能刀具组装单</field>
@@ -190,8 +121,8 @@
<sheet> <sheet>
<group string="功能刀具申请信息"> <group string="功能刀具申请信息">
<group> <group>
<field name="machine_tool_name"/> <field name="machine_tool_name_id"/>
<field name="functional_tool_name"/> <field name="functional_tool_name_id"/>
<field name="functional_tool_length"/> <field name="functional_tool_length"/>
<field name="effective_length"/> <field name="effective_length"/>
<field name="functional_tool_cutting_type"/> <field name="functional_tool_cutting_type"/>
@@ -199,7 +130,7 @@
</group> </group>
<group> <group>
<field name="cutter_spacing_code"/> <field name="cutter_spacing_code"/>
<field name="functional_tool_type"/> <field name="functional_tool_type_id"/>
<field name="functional_tool_diameter"/> <field name="functional_tool_diameter"/>
<field name="tool_included_angle"/> <field name="tool_included_angle"/>
<field name="whether_standard_tool"/> <field name="whether_standard_tool"/>
@@ -267,7 +198,7 @@
<field name="order"/> <field name="order"/>
<field name="functional_tool_code"/> <field name="functional_tool_code"/>
<field name="name"/> <field name="name"/>
<field name="functional_tool_type"/> <field name="functional_tool_type_id"/>
<field name="production_line_name"/> <field name="production_line_name"/>
<field name="machine_tool_code"/> <field name="machine_tool_code"/>
<field name="receive_person"/> <field name="receive_person"/>