优化了刀具管理-功能刀具组装的刀具物料字段,新增功能刀具组装完成时新建功能刀具列表、预警、实时分布、出入库记录数据功能
This commit is contained in:
@@ -106,6 +106,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
|
||||
|
||||
# 功能刀具申请信息
|
||||
machine_tool_name_id = fields.Many2one('sf.machine_tool', string='机床名称', readonly=True)
|
||||
code = fields.Char(string='功能刀具编码', readonly=True)
|
||||
cutter_spacing_code = fields.Char(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)
|
||||
@@ -118,14 +119,50 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
|
||||
whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=True)
|
||||
|
||||
# 功能刀具组装信息
|
||||
tool_name = fields.Char(string='刀具名称')
|
||||
tool_code = fields.Char(string='刀具编码')
|
||||
tool_brand = fields.Char(string='品牌')
|
||||
tool_type = fields.Char(string='型号')
|
||||
knife_handle_name = fields.Char(string='刀柄名称')
|
||||
knife_handle_code = fields.Char(string='刀柄编码')
|
||||
knife_handle_brand = fields.Char(string='品牌')
|
||||
knife_handle_type = fields.Char(string='型号')
|
||||
# 整体式刀具型号
|
||||
mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
|
||||
string='整体式刀具型号', readonly=False, domain=
|
||||
[('mrs_cutting_tool_material_name', '=', '整体式刀具')])
|
||||
integral_code = fields.Char('整体式刀具序列号')
|
||||
integral_name = fields.Char('整体式刀具名称')
|
||||
sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌')
|
||||
# 刀片型号
|
||||
mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
|
||||
string='刀片型号', readonly=False, domain=
|
||||
[('mrs_cutting_tool_material_name', '=', '刀片')])
|
||||
blade_code = fields.Char('刀片序列号')
|
||||
blade_name = fields.Char('刀片名称')
|
||||
sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌')
|
||||
# 刀杆型号
|
||||
mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
|
||||
string='刀杆型号', readonly=False, domain=
|
||||
[('mrs_cutting_tool_material_name', '=', '刀杆')])
|
||||
bar_code = fields.Char('刀杆序列号')
|
||||
bar_name = fields.Char('刀杆名称')
|
||||
sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌')
|
||||
# 刀盘型号
|
||||
mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
|
||||
string='刀盘型号', readonly=False, domain=
|
||||
[('mrs_cutting_tool_material_name', '=', '刀盘')])
|
||||
pad_code = fields.Char('刀盘序列号')
|
||||
pad_name = fields.Char('刀盘名称')
|
||||
sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌')
|
||||
|
||||
# 刀柄型号
|
||||
mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
|
||||
string='刀柄型号', readonly=False, domain=
|
||||
[('mrs_cutting_tool_material_name', '=', '刀柄')])
|
||||
handle_code = fields.Char('刀柄序列号')
|
||||
handle_name = fields.Char('刀柄名称')
|
||||
sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌')
|
||||
# 夹头型号
|
||||
mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
|
||||
string='夹头型号', readonly=False, domain=
|
||||
[('mrs_cutting_tool_material_name', '=', '夹头')])
|
||||
chuck_code = fields.Char('夹头序列号')
|
||||
chuck_name = fields.Char('夹头名称')
|
||||
sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌')
|
||||
|
||||
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精')
|
||||
tool_loading_length = fields.Char(string='装刀长')
|
||||
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧')
|
||||
@@ -143,12 +180,30 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
|
||||
('machine_tool_name_id', '=', self.machine_tool_name_id.id),
|
||||
('cutter_spacing_code', '=', self.cutter_spacing_code)
|
||||
]).write({
|
||||
'tool_name': self.tool_name,
|
||||
'tool_brand': self.tool_brand,
|
||||
'tool_type': self.tool_type,
|
||||
'knife_handle_name': self.knife_handle_name,
|
||||
'knife_handle_brand': self.knife_handle_brand,
|
||||
'knife_handle_type': self.knife_handle_type,
|
||||
'mrs_cutting_tool_integral_model_ids': self.mrs_cutting_tool_integral_model_ids.ids,
|
||||
'integral_code': self.integral_code,
|
||||
'integral_name': self.integral_name,
|
||||
'sf_tool_brand_id_1': self.sf_tool_brand_id_1,
|
||||
'mrs_cutting_tool_blade_model_ids': self.mrs_cutting_tool_blade_model_ids.ids,
|
||||
'blade_code': self.blade_code,
|
||||
'blade_name': self.blade_name,
|
||||
'sf_tool_brand_id_2': self.sf_tool_brand_id_2,
|
||||
'mrs_cutting_tool_cutterbar_model_ids': self.mrs_cutting_tool_cutterbar_model_ids.ids,
|
||||
'bar_code': self.bar_code,
|
||||
'bar_name': self.bar_name,
|
||||
'sf_tool_brand_id_3': self.sf_tool_brand_id_3,
|
||||
'mrs_cutting_tool_cutterpad_model_ids': self.mrs_cutting_tool_cutterpad_model_ids.ids,
|
||||
'pad_code': self.pad_code,
|
||||
'pad_name': self.pad_name,
|
||||
'sf_tool_brand_id_4': self.sf_tool_brand_id_4,
|
||||
'mrs_cutting_tool_cutterhandle_model_ids': self.mrs_cutting_tool_cutterhandle_model_ids.ids,
|
||||
'handle_code': self.handle_code,
|
||||
'handle_name': self.handle_name,
|
||||
'sf_tool_brand_id_5': self.sf_tool_brand_id_5,
|
||||
'mrs_cutting_tool_cutterhead_model_ids': self.mrs_cutting_tool_cutterhead_model_ids.ids,
|
||||
'chuck_code': self.chuck_code,
|
||||
'chuck_name': self.chuck_name,
|
||||
'sf_tool_brand_id_6': self.sf_tool_brand_id_6,
|
||||
'coarse_middle_thin': self.coarse_middle_thin,
|
||||
'tool_loading_length': self.tool_loading_length,
|
||||
'new_former': self.new_former,
|
||||
@@ -161,6 +216,38 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
|
||||
'tool_loading_time': fields.Datetime.now()
|
||||
})
|
||||
|
||||
# 封装功能刀具数据
|
||||
desc = {
|
||||
'code': self.code,
|
||||
'name': self.functional_tool_name_id.name,
|
||||
'mrs_cutting_tool_type_id': self.functional_tool_type_id.id,
|
||||
'mrs_cutting_tool_integral_model_ids': self.mrs_cutting_tool_integral_model_ids.ids,
|
||||
'mrs_cutting_tool_blade_model_ids': self.mrs_cutting_tool_blade_model_ids.ids,
|
||||
'mrs_cutting_tool_cutterbar_model_ids': self.mrs_cutting_tool_cutterbar_model_ids.ids,
|
||||
'mrs_cutting_tool_cutterpad_model_ids': self.mrs_cutting_tool_cutterpad_model_ids.ids,
|
||||
'mrs_cutting_tool_cutterhandle_model_ids': self.mrs_cutting_tool_cutterhandle_model_ids.ids,
|
||||
'mrs_cutting_tool_cutterhead_model_ids': self.mrs_cutting_tool_cutterhead_model_ids.ids,
|
||||
'diameter': self.functional_tool_diameter,
|
||||
'tool_grade': None,
|
||||
'machining_accuracy': None,
|
||||
'tool_length': self.tool_loading_length,
|
||||
'blade_number': None,
|
||||
'integral_blade_length': None,
|
||||
'effective_blade_length': self.effective_length,
|
||||
'max_life': None,
|
||||
'is_standard': self.whether_standard_tool,
|
||||
'applicable_range': None,
|
||||
'image': None,
|
||||
}
|
||||
|
||||
if self.new_former == '0':
|
||||
# 如果是新刀,则创建功能刀具列表、
|
||||
self.env['sf.functional.cutting.tool.entity'].create(desc)
|
||||
# 创建功能刀具预警、实时分布、出入库记录的新记录
|
||||
self.env['sf.functional.tool.warning'].create(desc)
|
||||
self.env['sf.real.time.distribution.of.functional.tools'].create(desc)
|
||||
self.env['sf.inbound.and.outbound.records.of.functional.tools'].create(desc)
|
||||
|
||||
# 关闭弹出窗口
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
@@ -173,7 +260,7 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
|
||||
functional_tool_code = fields.Char(string='功能刀具编码')
|
||||
name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称')
|
||||
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
|
||||
production_line_name = fields.Char(string='产线名称')
|
||||
production_line_name_id = fields.Many2one('sf.production.line', string='产线名称')
|
||||
machine_tool_code = fields.Char(string='机台号')
|
||||
receive_person = fields.Char(string='领用人')
|
||||
receive_time = fields.Datetime(string='领用出库时间')
|
||||
@@ -184,11 +271,14 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
|
||||
:return:
|
||||
"""
|
||||
vals = self.env['sf.delivery.of.cargo.from.storage'].search([])
|
||||
print(vals)
|
||||
if vals:
|
||||
for val in vals:
|
||||
self.env['sf.functional.tool.assembly'].search([
|
||||
('functional_tool_code', '=', val.functional_tool_code),
|
||||
('name', '=', val.name.id)
|
||||
('machine_tool_code', '=', val.machine_tool_code),
|
||||
('name', '=', val.name.id),
|
||||
('production_line_name_id', '=', val.production_line_name_id.id)
|
||||
]).write({
|
||||
'assemble_status': '2',
|
||||
'receive_person': self.env.user.name,
|
||||
|
||||
Reference in New Issue
Block a user