优化了刀具管理-功能刀具组装的刀具物料字段,新增功能刀具组装完成时新建功能刀具列表、预警、实时分布、出入库记录数据功能

This commit is contained in:
yuxianghui
2023-08-02 17:29:02 +08:00
parent 858acf053e
commit 6c001b6950
5 changed files with 326 additions and 91 deletions

View File

@@ -10,7 +10,7 @@
""", """,
'category': 'sf', 'category': 'sf',
'website': 'https://www.sf.jikimo.com', 'website': 'https://www.sf.jikimo.com',
'depends': ['account', 'sf_base', 'mrp'], 'depends': ['account', 'sf_base', 'mrp', 'sf_manufacturing'],
'data': [ 'data': [
#'security/group_security.xml', #'security/group_security.xml',
'security/ir.model.access.csv', 'security/ir.model.access.csv',

View File

@@ -393,7 +393,7 @@ class MachineTableToolChangingApply(models.Model):
# 撤回功能刀具组装创建的任务 # 撤回功能刀具组装创建的任务
self.env['sf.functional.tool.assembly'].search( self.env['sf.functional.tool.assembly'].search(
[('functional_tool_code', '=', self.replacement_tool_code), [('functional_tool_code', '=', self.replacement_tool_code),
('loading_task_source', '=', '机台换刀')]).unlink() ('loading_task_source', '=', '1')]).unlink()
# 撤回数据更新 # 撤回数据更新
self.env['sf.machine.table.tool.changing.apply'].search([('name', '=', self.name.id)]).write({ self.env['sf.machine.table.tool.changing.apply'].search([('name', '=', self.name.id)]).write({
@@ -444,7 +444,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
need_knife_time = fields.Datetime(string='需要用刀时间', readonly=False) 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=False) string='计划执行状态', default='0', readonly=False)
applicant = fields.Char(string='申请人', readonly=False) applicant = fields.Char(string='申请人', readonly=True)
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)
@@ -462,7 +462,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
'loading_task_source': '0', 'loading_task_source': '0',
'coarse_middle_thin': None, 'coarse_middle_thin': None,
'tool_loading_length': None, 'tool_loading_length': None,
'applicant': self.applicant, 'applicant': self.env.user.name,
'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_id': self.machine_table_name_id.id, 'machine_tool_name_id': self.machine_table_name_id.id,
@@ -472,7 +472,8 @@ 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',
'applicant': self.env.user.name})
def revocation(self): def revocation(self):
@@ -480,13 +481,16 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
撤回装刀申请 撤回装刀申请
: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', '=', 'CAM装刀')]).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({'plan_execute_status': '0',
'applicant': None})
@@ -504,19 +508,58 @@ class FunctionalToolAssembly(models.Model):
functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True) functional_tool_length = fields.Char(string='功能刀具伸出长', readonly=True)
functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False) functional_tool_cutting_type = fields.Char(string='功能刀具切削类型', readonly=False)
tool_name = fields.Char(string='刀具名称', readonly=False) # 整体式刀具型号
tool_brand = fields.Char(string='品牌', readonly=False) mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id',
tool_type = fields.Char(string='型号', readonly=False) string='整体式刀具型号', readonly=True, domain=
knife_handle_name = fields.Char(string='刀柄名称', readonly=False) [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
knife_handle_brand = fields.Char(string='品牌', readonly=False) integral_code = fields.Char('整体式刀具序列号', readonly=True)
knife_handle_type = fields.Char(string='型号', readonly=False) integral_name = fields.Char('整体式刀具名称', readonly=True)
coarse_middle_thin = fields.Selection([("1", ""), ('2', ''), ('3', '')], string='粗/中/精', readonly=False) sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌', readonly=True)
tool_loading_length = fields.Char(string='装刀长', readonly=False) # 刀片型号
new_former = fields.Selection([('0', ''), ('1', '')], string='新/旧', readonly=False) mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id',
reference_length = fields.Char(string='参考伸出长', readonly=False) string='刀片型号', readonly=True, domain=
cut_time = fields.Char(string='已切削时间', readonly=False) [('mrs_cutting_tool_material_name', '=', '刀片')])
cut_length = fields.Char(string='已切削长度', readonly=False) blade_code = fields.Char('刀片序列号', readonly=True)
cut_number = fields.Char(string='已切削次数', readonly=False) blade_name = fields.Char('刀片名称', 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_id',
string='刀杆型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀杆')])
bar_code = fields.Char('刀杆序列号', readonly=True)
bar_name = fields.Char('刀杆名称', 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_id',
string='刀盘型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀盘')])
pad_code = fields.Char('刀盘序列号', readonly=True)
pad_name = fields.Char('刀盘名称', 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_id',
string='刀柄型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '刀柄')])
handle_code = fields.Char('刀柄序列号', readonly=True)
handle_name = fields.Char('刀柄名称', 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_id',
string='夹头型号', readonly=True, domain=
[('mrs_cutting_tool_material_name', '=', '夹头')])
chuck_code = fields.Char('夹头序列号', readonly=True)
chuck_name = fields.Char('夹头名称', readonly=True)
sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True)
coarse_middle_thin = fields.Selection([("1", ""), ('2', ''), ('3', '')], string='粗/中/精', readonly=True)
tool_loading_length = fields.Char(string='装刀长', readonly=True)
new_former = fields.Selection([('0', ''), ('1', '')], string='新/旧', readonly=True)
reference_length = fields.Char(string='参考伸出长', readonly=True)
cut_time = fields.Char(string='已切削时间', readonly=True)
cut_length = fields.Char(string='已切削长度', readonly=True)
cut_number = fields.Char(string='已切削次数', readonly=True)
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)
@@ -524,7 +567,7 @@ 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=False) production_line_name_id = fields.Many2one('sf.production.line', string='产线名称', readonly=False)
machine_tool_name_id = fields.Many2one('sf.machine_tool', 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)
@@ -552,12 +595,30 @@ class FunctionalToolAssembly(models.Model):
('machine_tool_name_id', '=', self.machine_tool_name_id.id), ('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, 'mrs_cutting_tool_integral_model_ids': None,
'tool_brand': None, 'integral_code': None,
'tool_type': None, 'integral_name': None,
'knife_handle_name': None, 'sf_tool_brand_id_1': None,
'knife_handle_brand': None, 'mrs_cutting_tool_blade_model_ids': None,
'knife_handle_type': None, 'blade_code': None,
'blade_name': None,
'sf_tool_brand_id_2': None,
'mrs_cutting_tool_cutterbar_model_ids': None,
'bar_code': None,
'bar_name': None,
'sf_tool_brand_id_3': None,
'mrs_cutting_tool_cutterpad_model_ids': None,
'pad_code': None,
'pad_name': None,
'sf_tool_brand_id_4': None,
'mrs_cutting_tool_cutterhandle_model_ids': None,
'handle_code': None,
'handle_name': None,
'sf_tool_brand_id_5': None,
'mrs_cutting_tool_cutterhead_model_ids': None,
'chuck_code': None,
'chuck_name': None,
'sf_tool_brand_id_6': None,
'coarse_middle_thin': None, 'coarse_middle_thin': None,
'tool_loading_length': None, 'tool_loading_length': None,
'new_former': None, 'new_former': None,
@@ -579,14 +640,13 @@ class FunctionalToolAssembly(models.Model):
self.env['sf.delivery.of.cargo.from.storage'].search([]).unlink() self.env['sf.delivery.of.cargo.from.storage'].search([]).unlink()
vals = self.env['sf.functional.tool.assembly'].search([('check_box_1', '=', True),('assemble_status', '=', '1')]) vals = self.env['sf.functional.tool.assembly'].search([('check_box_1', '=', True),('assemble_status', '=', '1')])
if vals: if vals:
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.id, 'name': val.name.id,
'functional_tool_type_id': val.functional_tool_type_id.id, 'functional_tool_type_id': val.functional_tool_type_id.id,
'production_line_name': val.production_line_name, 'production_line_name_id': val.production_line_name_id.id,
'machine_tool_code': val.machine_tool_code, 'machine_tool_code': val.machine_tool_code,
'receive_person': val.receive_person, 'receive_person': val.receive_person,
'receive_time': val.receive_time 'receive_time': val.receive_time
@@ -596,7 +656,7 @@ class FunctionalToolAssembly(models.Model):
'functional_tool_code': self.functional_tool_code, 'functional_tool_code': self.functional_tool_code,
'name': self.name.id, 'name': self.name.id,
'functional_tool_type_id': self.functional_tool_type_id.id, 'functional_tool_type_id': self.functional_tool_type_id.id,
'production_line_name': self.production_line_name, 'production_line_name_id': self.production_line_name_id.id,
'machine_tool_code': self.machine_tool_code, 'machine_tool_code': self.machine_tool_code,
'receive_person': self.receive_person, 'receive_person': self.receive_person,
'receive_time': self.receive_time 'receive_time': self.receive_time

View File

@@ -9,14 +9,13 @@
<tree string="功能刀具列表"> <tree string="功能刀具列表">
<field name="code" /> <field name="code" />
<field name="name" /> <field name="name" />
<field name="mrs_cutting_tool_type_id"/> <field name="mrs_cutting_tool_type_id" />
<field name="mrs_cutting_tool_integral_model_ids" optional="hide"/> <field name="mrs_cutting_tool_integral_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_blade_model_ids" optional="hide"/> <field name="mrs_cutting_tool_blade_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" optional="hide"/> <field name="mrs_cutting_tool_cutterbar_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" optional="hide"/> <field name="mrs_cutting_tool_cutterpad_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" optional="hide"/> <field name="mrs_cutting_tool_cutterhandle_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" optional="hide"/> <field name="mrs_cutting_tool_cutterhead_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_type_id" />
<field name="image" widget='image'/> <field name="image" widget='image'/>
</tree> </tree>
</field> </field>
@@ -824,6 +823,7 @@
type="action" type="action"
context="{ context="{
'default_machine_tool_name_id': machine_tool_name_id, 'default_machine_tool_name_id': machine_tool_name_id,
'default_code': functional_tool_code,
'default_cutter_spacing_code': cutter_spacing_code, 'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_name_id': name, 'default_functional_tool_name_id': name,
'default_functional_tool_type_id': functional_tool_type_id, 'default_functional_tool_type_id': functional_tool_type_id,
@@ -853,6 +853,7 @@
type="action" type="action"
context="{ context="{
'default_machine_tool_name_id': machine_tool_name_id, 'default_machine_tool_name_id': machine_tool_name_id,
'default_code': functional_tool_code,
'default_cutter_spacing_code': cutter_spacing_code, 'default_cutter_spacing_code': cutter_spacing_code,
'default_functional_tool_name_id': name, 'default_functional_tool_name_id': name,
'default_functional_tool_type_id': functional_tool_type_id, 'default_functional_tool_type_id': functional_tool_type_id,
@@ -887,28 +888,52 @@
<field name="functional_tool_cutting_type"/> <field name="functional_tool_cutting_type"/>
</group> </group>
</group> </group>
<group string="组装信息"> <group string="组装物料信息">
<group> <group>
<field name="tool_name"/> <field name="integral_code"/>
<field name="tool_brand" string="刀具品牌"/> <field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="tool_type" string="刀具型号"/> <field name="blade_code"/>
<field name="coarse_middle_thin"/> <field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="bar_code"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="pad_code"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="handle_code"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="chuck_code"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
</group>
<group>
<field name="integral_name"/>
<field name="sf_tool_brand_id_1"/>
<field name="blade_name"/>
<field name="sf_tool_brand_id_2"/>
<field name="bar_name"/>
<field name="sf_tool_brand_id_3"/>
<field name="pad_name"/>
<field name="sf_tool_brand_id_4"/>
<field name="handle_name"/>
<field name="sf_tool_brand_id_5"/>
<field name="chuck_name"/>
<field name="sf_tool_brand_id_6"/>
</group>
</group>
<group string="组装参数信息">
<group>
<field name="coarse_middle_thin"/>
<field name="new_former"/> <field name="new_former"/>
<field name="tool_loading_length"/> <field name="tool_loading_length"/>
<field name="reference_length"/> <field name="reference_length"/>
</group> </group>
<group> <group>
<field name="knife_handle_name"/>
<field name="knife_handle_brand" string="刀柄品牌"/>
<field name="knife_handle_type" string="刀柄型号"/>
<field name="cut_time"/> <field name="cut_time"/>
<field name="cut_length"/> <field name="cut_length"/>
<field name="cut_number"/> <field name="cut_number"/>
</group> </group>
</group> </group>
<group string="申请信息"> <group string="申请信息">
<group> <group>
<field name="production_line_name"/> <field name="production_line_name_id"/>
<field name="machine_tool_name_id"/> <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"/>

View File

@@ -106,6 +106,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
# 功能刀具申请信息 # 功能刀具申请信息
machine_tool_name_id = fields.Many2one('sf.machine_tool', string='机床名称', readonly=True) 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) cutter_spacing_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)
@@ -118,14 +119,50 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=True) whether_standard_tool = fields.Boolean(string='是否标准刀', readonly=True)
# 功能刀具组装信息 # 功能刀具组装信息
tool_name = fields.Char(string='刀具名称') # 整体式刀具型号
tool_code = fields.Char(string='刀具编码') mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_order_id',
tool_brand = fields.Char(string='品牌') string='整体式刀具型号', readonly=False, domain=
tool_type = fields.Char(string='型号') [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
knife_handle_name = fields.Char(string='刀柄名称') integral_code = fields.Char('整体式刀具序列号')
knife_handle_code = fields.Char(string='刀柄编码') integral_name = fields.Char('整体式刀具名称')
knife_handle_brand = fields.Char(string='品牌') sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌')
knife_handle_type = fields.Char(string='型号') # 刀片型号
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='粗/中/精') coarse_middle_thin = fields.Selection([("1", ""), ('2', ''), ('3', '')], string='粗/中/精')
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='新/旧')
@@ -143,12 +180,30 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
('machine_tool_name_id', '=', self.machine_tool_name_id.id), ('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, 'mrs_cutting_tool_integral_model_ids': self.mrs_cutting_tool_integral_model_ids.ids,
'tool_brand': self.tool_brand, 'integral_code': self.integral_code,
'tool_type': self.tool_type, 'integral_name': self.integral_name,
'knife_handle_name': self.knife_handle_name, 'sf_tool_brand_id_1': self.sf_tool_brand_id_1,
'knife_handle_brand': self.knife_handle_brand, 'mrs_cutting_tool_blade_model_ids': self.mrs_cutting_tool_blade_model_ids.ids,
'knife_handle_type': self.knife_handle_type, '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, 'coarse_middle_thin': self.coarse_middle_thin,
'tool_loading_length': self.tool_loading_length, 'tool_loading_length': self.tool_loading_length,
'new_former': self.new_former, 'new_former': self.new_former,
@@ -161,6 +216,38 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
'tool_loading_time': fields.Datetime.now() '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'} return {'type': 'ir.actions.act_window_close'}
@@ -173,7 +260,7 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
functional_tool_code = fields.Char(string='功能刀具编码') functional_tool_code = fields.Char(string='功能刀具编码')
name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称') name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称')
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', 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='机台号') machine_tool_code = fields.Char(string='机台号')
receive_person = fields.Char(string='领用人') receive_person = fields.Char(string='领用人')
receive_time = fields.Datetime(string='领用出库时间') receive_time = fields.Datetime(string='领用出库时间')
@@ -184,11 +271,14 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
:return: :return:
""" """
vals = self.env['sf.delivery.of.cargo.from.storage'].search([]) vals = self.env['sf.delivery.of.cargo.from.storage'].search([])
print(vals)
if vals: if vals:
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.id) ('machine_tool_code', '=', val.machine_tool_code),
('name', '=', val.name.id),
('production_line_name_id', '=', val.production_line_name_id.id)
]).write({ ]).write({
'assemble_status': '2', 'assemble_status': '2',
'receive_person': self.env.user.name, 'receive_person': self.env.user.name,

View File

@@ -122,11 +122,11 @@
<group string="功能刀具申请信息"> <group string="功能刀具申请信息">
<group> <group>
<field name="machine_tool_name_id"/> <field name="machine_tool_name_id"/>
<field name="code"/>
<field name="functional_tool_name_id"/> <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"/>
<field name="required_cutting_time"/>
</group> </group>
<group> <group>
<field name="cutter_spacing_code"/> <field name="cutter_spacing_code"/>
@@ -134,40 +134,100 @@
<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"/>
<field name="required_cutting_time"/>
</group> </group>
</group> </group>
<group string="功能刀具组装信息"> <!-- <group string="功能刀具组装信息">-->
<!-- <group>-->
<!-- <group>-->
<!-- <field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>-->
<!-- <field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>-->
<!-- <field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>-->
<!-- <field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>-->
<!-- <field name="mrs_cutting_tool_cutterhandle_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>-->
<!-- <field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>-->
<!-- <field name="tool_loading_length"/>-->
<!-- </group>-->
<!-- <group>-->
<!-- <field name="integral_code"/>-->
<!-- <field name="blade_code"/>-->
<!-- <field name="bar_code"/>-->
<!-- <field name="pad_code"/>-->
<!-- <field name="handle_code"/>-->
<!-- <field name="chuck_code"/>-->
<!-- <field name="coarse_middle_thin"/>-->
<!-- </group>-->
<!-- </group>-->
<!-- <group>-->
<!-- <group>-->
<!-- <field name="integral_name"/>-->
<!-- <field name="blade_name"/>-->
<!-- <field name="bar_name"/>-->
<!-- <field name="pad_name"/>-->
<!-- <field name="handle_name"/>-->
<!-- <field name="chuck_name"/>-->
<!-- <field name="new_former"/>-->
<!-- </group>-->
<!-- <group>-->
<!-- <field name="sf_tool_brand_id_1"/>-->
<!-- <field name="sf_tool_brand_id_2"/>-->
<!-- <field name="sf_tool_brand_id_3"/>-->
<!-- <field name="sf_tool_brand_id_4"/>-->
<!-- <field name="sf_tool_brand_id_5"/>-->
<!-- <field name="sf_tool_brand_id_6"/>-->
<!-- <field name="reference_length"/>-->
<!-- </group>-->
<!-- </group>-->
<!-- </group>-->
<!-- <group>-->
<!-- <group>-->
<!-- <field name="cut_time"/>-->
<!-- <field name="cut_length"/>-->
<!-- <field name="cut_number"/>-->
<!-- </group>-->
<!-- </group>-->
<group string="组装物料信息">
<group>
<field name="integral_code"/>
<field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="blade_code"/>
<field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="bar_code"/>
<field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="pad_code"/>
<field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="handle_code"/>
<field name="mrs_cutting_tool_cutterhandle_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
<field name="chuck_code"/>
<field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
</group>
<group>
<field name="integral_name"/>
<field name="sf_tool_brand_id_1"/>
<field name="blade_name"/>
<field name="sf_tool_brand_id_2"/>
<field name="bar_name"/>
<field name="sf_tool_brand_id_3"/>
<field name="pad_name"/>
<field name="sf_tool_brand_id_4"/>
<field name="handle_name"/>
<field name="sf_tool_brand_id_5"/>
<field name="chuck_name"/>
<field name="sf_tool_brand_id_6"/>
</group>
</group>
<group string="组装参数信息">
<group> <group>
<group> <field name="coarse_middle_thin"/>
<field name="tool_name"/> <field name="new_former"/>
<field name="knife_handle_name"/> <field name="tool_loading_length"/>
<field name="tool_loading_length"/> <field name="reference_length"/>
</group> </group>
<group> <group>
<field name="tool_code"/> <field name="cut_time"/>
<field name="knife_handle_code"/> <field name="cut_length"/>
<field name="coarse_middle_thin"/> <field name="cut_number"/>
</group> </group>
</group>
<group>
<group>
<field name="tool_brand"/>
<field name="knife_handle_brand"/>
<field name="new_former"/>
</group>
<group>
<field name="tool_type"/>
<field name="knife_handle_type"/>
<field name="reference_length"/>
</group>
</group>
</group>
<group>
<group>
<field name="cut_time"/>
<field name="cut_length"/>
<field name="cut_number"/>
</group>
</group> </group>
</sheet> </sheet>
<footer> <footer>
@@ -199,7 +259,7 @@
<field name="functional_tool_code"/> <field name="functional_tool_code"/>
<field name="name"/> <field name="name"/>
<field name="functional_tool_type_id"/> <field name="functional_tool_type_id"/>
<field name="production_line_name"/> <field name="production_line_name_id"/>
<field name="machine_tool_code"/> <field name="machine_tool_code"/>
<field name="receive_person"/> <field name="receive_person"/>
<field name="receive_time"/> <field name="receive_time"/>