From bf8b45609c114a9b055ca41f5d5f65ba93742f33 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Fri, 24 Nov 2023 17:12:44 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A8=A1=E5=9E=8B=E6=96=B0=E5=A2=9E=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=8A=9F=E8=83=BD=EF=BC=9B2=E3=80=81?= =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E5=BA=93=E5=AD=98=E6=A8=A1=E5=9E=8B=EF=BC=9B3?= =?UTF-8?q?=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E5=8D=95=E5=BC=B9=E7=AA=97=E7=95=8C=E9=9D=A2=E7=9A=84=E5=88=80?= =?UTF-8?q?=E5=85=B7=E7=89=A9=E6=96=99=E6=96=B0=E5=A2=9E=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA=E5=88=80=E5=85=B7=E6=88=BF=E7=9A=84=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E7=AD=9B=E9=80=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/base.py | 181 +++++++----------- sf_tool_management/views/tool_base_views.xml | 190 +++++++++---------- sf_tool_management/wizard/wizard.py | 76 ++++++-- 3 files changed, 211 insertions(+), 236 deletions(-) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 7402632f..35949f47 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -6,11 +6,6 @@ from odoo import SUPERUSER_ID from odoo.exceptions import ValidationError -# class FunctionalCuttingToolEntity(models.Model): -# _name = 'sf.functional.cutting.tool.entity' -# _inherit = 'sf.functional.cutting.tool' -# _inherits = {'sf.functional.cutting.tool': 'sf_functional_cutting_tool_entity_id'} -# _description = '功能刀具管理' class FunctionalCuttingToolEntity(models.Model): _name = 'sf.functional.cutting.tool.entity' _description = '功能刀具列表' @@ -118,6 +113,14 @@ class FunctionalCuttingToolEntity(models.Model): result['domain'] = [('lot_id', '=', self.barcode_id.id), ('qty_done', '>', 0)] return result + def open_safety_stock(self): + action = self.env.ref('sf_tool_management.sf_real_time_distribution_of_functional_tools_view_act') + result = action.read()[0] + result['domain'] = [('name', '=', self.name), ('diameter', '=', self.functional_tool_diameter), + ('knife_tip_r_angle', '=', self.knife_tip_r_angle), + ('coarse_middle_thin', '=', self.coarse_middle_thin)] + return result + class FunctionalToolWarning(models.Model): _name = 'sf.functional.tool.warning' @@ -178,113 +181,74 @@ class RealTimeDistributionOfFunctionalTools(models.Model): _name = 'sf.real.time.distribution.of.functional.tools' _description = '功能刀具安全库存' - functional_cutting_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', readonly=True) - mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, - group_expand='_read_mrs_cutting_tool_type_ids', - store=True, - compute='_compute_functional_cutting_tool_ids') + name = fields.Char('功能刀具名称') + sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', + group_expand='_read_mrs_cutting_tool_type_ids', store=True) + diameter = fields.Integer(string='刀具直径(mm)') + knife_tip_r_angle = fields.Float(string='刀尖R角(mm)') + tool_stock_num = fields.Integer(string='刀具房数量') + side_shelf_num = fields.Integer(string='线边刀库数量') + on_tool_stock_num = fields.Integer(string='机内刀库数量') + tool_stock_total = fields.Integer(string='当前库存量', readonly=True, compute='_compute_tool_stock_total') + min_stock_num = fields.Integer('最低库存量') + max_stock_num = fields.Integer('最高库存量') + batch_replenishment_num = fields.Integer('批次补货量') + unit = fields.Char('单位') + image = fields.Binary('图片') + + coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精') + whether_standard_knife = fields.Boolean(string='是否标准刀', default=True) + # 能力特征信息 + suitable_machining_method_ids = fields.Many2many( + 'maintenance.equipment.image', 'rel_machining_product_template_distribution', '适合加工方式', + domain=[('type', '=', '加工能力')], + related='sf_functional_cutting_tool_entity_ids.suitable_machining_method_ids') + blade_tip_characteristics_id = fields.Many2many( + 'maintenance.equipment.image', 'rel_blade_tip_product_template_distribution', '刀尖特征', + domain=[('type', '=', '刀尖特征')], + related='sf_functional_cutting_tool_entity_ids.blade_tip_characteristics_id') + handle_type_ids = fields.Many2many( + 'maintenance.equipment.image', 'rel_handle_product_template_distribution', '柄部类型', + domain=[('type', '=', '柄部类型')], related='sf_functional_cutting_tool_entity_ids.handle_type_ids') + cutting_direction_ids = fields.Many2many( + 'maintenance.equipment.image', 'rel_cutting_product_template_distribution', '走刀方向', + domain=[('type', '=', '走刀方向')], related='sf_functional_cutting_tool_entity_ids.cutting_direction_ids') + suitable_coolant_ids = fields.Many2many( + 'maintenance.equipment.image', 'rel_coolant_product_template_distribution', '适合冷却液', + domain=[('type', '=', '冷却液')], related='sf_functional_cutting_tool_entity_ids.suitable_coolant_ids') + + sf_functional_cutting_tool_entity_ids = fields.Many2many('sf.functional.cutting.tool.entity', + 'sf_functional_cutting_tool_entity_ref', + string='功能刀具列表信息', readonly=True) @api.model def _read_mrs_cutting_tool_type_ids(self, categories, domain, order): mrs_cutting_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) return categories.browse(mrs_cutting_tool_type_ids) - @api.depends('functional_cutting_tool_id') - def _compute_functional_cutting_tool_ids(self): - for record in self: - if record: - record.mrs_cutting_tool_type_id = record.functional_cutting_tool_id.mrs_cutting_tool_type_id.id - - barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) - name = fields.Char('名称', invisible=True, readonly=True) - functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True) - - # 整体式刀具型号 - cutting_tool_integral_model_id = fields.Many2one( - 'product.product', string='整体式刀具型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '整体式刀具')], - related='functional_cutting_tool_id.cutting_tool_integral_model_id') - - # 刀片型号 - cutting_tool_blade_model_id = fields.Many2one( - 'product.product', string='刀片型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀片')], - related='functional_cutting_tool_id.cutting_tool_blade_model_id') - - # 刀杆型号 - cutting_tool_cutterbar_model_id = fields.Many2one( - 'product.product', string='刀杆型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀杆')], - related='functional_cutting_tool_id.cutting_tool_cutterbar_model_id') - - # 刀盘型号 - cutting_tool_cutterpad_model_id = fields.Many2one( - 'product.product', string='刀盘型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀盘')], - related='functional_cutting_tool_id.cutting_tool_cutterpad_model_id') - - # 刀柄型号 - cutting_tool_cutterhandle_model_id = fields.Many2one( - 'product.product', string='刀柄型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀柄')], - related='functional_cutting_tool_id.cutting_tool_cutterhandle_model_id') - - # 夹头型号 - cutting_tool_cutterhead_model_id = fields.Many2one( - 'product.product', string='夹头型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '夹头')], - related='functional_cutting_tool_id.cutting_tool_cutterhead_model_id') - - diameter = fields.Float('直径(mm)', readonly=True) - tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], - string='刀具等级', readonly=True) - machining_accuracy = fields.Float('加工精度(mm)', readonly=True) - tool_length = fields.Float('装刀长(mm)', readonly=True) - blade_number = fields.Integer('刃数', readonly=True) - integral_blade_length = fields.Float('整体刃长(mm)', readonly=True) - effective_blade_length = fields.Float('有效刃长(mm)', readonly=True) - max_life = fields.Float('最大寿命值', readonly=True) - is_standard = fields.Selection([('1', '是'), ('0', '否')], '是否标准刀', readonly=True, - compute='_compute_functional_cutting_tool_id') - applicable_range = fields.Char('适用范围', readonly=True) - image = fields.Binary('图片', readonly=True) - - @api.depends('functional_cutting_tool_id') - def _compute_functional_cutting_tool_id(self): - if self.functional_cutting_tool_id: - self.tool_grade = self.functional_cutting_tool_id.tool_grade - self.is_standard = self.functional_cutting_tool_id.is_standard - - # 功能刀具实时分布 - tool_stock_num = fields.Integer(string='刀具房库存数量', readonly=False) - side_shelf_num = fields.Integer(string='线边货架货架数量', readonly=False) - on_tool_stock_num = fields.Integer(string='机内刀库库存数量', readonly=False) - tool_stock_total = fields.Integer(string='合计(库存)', readonly=True, compute='_compute_tool_stock_total') - return_reuse_num_re = fields.Integer(string='归还再用数量(精)', readonly=False) - return_reuse_num_co = fields.Integer(string='归还再用数量(粗)', readonly=False) - return_processing_num = fields.Integer(string='归还需磨削数量', readonly=False) - return_total = fields.Integer(string='合计(归还)', readonly=True, compute='_compute_return_total') - total = fields.Integer(string='总计', readonly=True, compute='_compute_total') - remark = fields.Char(string='备注/说明', readonly=False) - @api.depends('tool_stock_num', 'side_shelf_num', 'on_tool_stock_num') def _compute_tool_stock_total(self): for record in self: if record: self.tool_stock_total = record.tool_stock_num + record.side_shelf_num + record.on_tool_stock_num - @api.depends('return_reuse_num_re', 'return_reuse_num_co', 'return_processing_num') - def _compute_return_total(self): - for record in self: - if record: - self.return_total = (record.return_reuse_num_re + record.return_reuse_num_co + - record.return_processing_num) - - @api.depends('tool_stock_total', 'return_total') - def _compute_total(self): - for record in self: - if record: - self.total = record.tool_stock_total + record.return_total + def create_or_edit_safety_stock(self, vals, sf_functional_cutting_tool_entity_ids): + """ + 根据传入的信息新增或者更新功能刀具安全库存的信息 + """ + print(vals) + # 根据功能刀具名称、直径或尖刀R角、粗/中/精查询该功能刀具是否已经存在 + record = self.env['sf.real.time.distribution.of.functional.tools'].search( + [('name', '=', vals['name']), ('sf_cutting_tool_type_id', '=', vals['sf_cutting_tool_type_id']), + ('diameter', '=', vals['diameter']), ('knife_tip_r_angle', '=', vals['knife_tip_r_angle']), + ('knife_tip_r_angle', '=', vals['knife_tip_r_angle'])]) + print(record) + if len(record) > 0: + for obj in record: + obj.write({'sf_functional_cutting_tool_entity_ids': [(4, sf_functional_cutting_tool_entity_ids.id)]}) + else: + vals['sf_functional_cutting_tool_entity_ids'] = sf_functional_cutting_tool_entity_ids.ids + self.env['sf.real.time.distribution.of.functional.tools'].create(vals) class MachineTableToolChangingApply(models.Model): @@ -293,6 +257,7 @@ class MachineTableToolChangingApply(models.Model): _order = 'cutter_spacing_code_id' name = fields.Char('名称', related='maintenance_equipment_id.name', store=True) + # 设备信息 maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床', required=True, readonly=False, domain=[('category_id.equipment_type', '=', '机床')]) production_line_id = fields.Many2one('sf.production.line', string='生产线', readonly=True, @@ -302,6 +267,7 @@ class MachineTableToolChangingApply(models.Model): machine_tool_code = fields.Char(string='机台号', store=True, invisible=True, readonly=True) cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=False, required=True, domain="[('equipment_id', '=', maintenance_equipment_id)]") + # 功能刀具信息 functional_tool_name = fields.Char(string='刀具名称', related='functional_tool_name_id.name', store=True) barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', store=True, domain=[('product_id.name', '=', '功能刀具')], @@ -407,20 +373,7 @@ class MachineTableToolChangingApply(models.Model): machine_table_tool_changing_apply.write( {'status': '1', - 'sf_functional_tool_assembly_id': sf_functional_tool_assembly}) - - # def new_assembly_task(self, vals): - # """ - # 新建组装任务 - # :param vals: - # :return: - # """ - # # 增加设置直径的值 - # tool_changing_apply = self.env['sf.machine.table.tool.changing.apply'].search( - # [('name', '=', vals['name'])]) - # vals['functional_tool_diameter'] = tool_changing_apply.diameter - # - # self.env['sf.functional.tool.assembly'].create(vals) + 'sf_functional_tool_assembly_id': sf_functional_tool_assembly.id}) def revocation_1(self): """ diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 674c9faf..a764b896 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -61,6 +61,16 @@ +

@@ -264,126 +274,95 @@ - + - 功能刀具实时分布 + 功能刀具安全库存 sf.real.time.distribution.of.functional.tools - - - - - - - - - - + + + + - - - - - - + + + + - 功能刀具实时分布 + 功能刀具安全库存 sf.real.time.distribution.of.functional.tools

- +

- - - - - - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -392,28 +371,31 @@ - 功能刀具实时分布 + 功能刀具安全库存 sf.real.time.distribution.of.functional.tools - - - - - - - - - + + + + + + + + + + + + - + - 功能刀具实时分布 + 功能刀具安全库存 ir.actions.act_window sf.real.time.distribution.of.functional.tools tree,form,search diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index d667ba33..16ae5259 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -57,12 +57,10 @@ class ToolChangeRequirementInformation(models.TransientModel): 确认换刀申请（按键） :return: """ - print('已运行') record = self.env['sf.machine.table.tool.changing.apply'].search( [('maintenance_equipment_id', '=', self.maintenance_equipment_id.id), ('cutter_spacing_code_id', '=', self.cutter_spacing_code_id.id) ]) - print('运行record_1') # 功能刀具组装创建新任务(new_assembly_task) sf_functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().create({ @@ -86,13 +84,11 @@ class ToolChangeRequirementInformation(models.TransientModel): 'reason_for_applying': self.reason_for_applying, 'sf_machine_table_tool_changing_apply_id': record.id }) - print('sf_functional_tool_assembly:', sf_functional_tool_assembly) # 修改机床换刀申请状态 record.write({ 'status': '1', - 'sf_functional_tool_assembly_id': sf_functional_tool_assembly + 'sf_functional_tool_assembly_id': sf_functional_tool_assembly.id }) - print('运行成功') # 关闭弹出窗口 return {'type': 'ir.actions.act_window_close'} @@ -186,7 +182,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel): # 功能刀具组装信息 # 整体式刀具型号 integral_code_id = fields.Many2one('stock.lot', string='整体式刀具序列号', - domain=[('product_id.cutting_tool_material_id.name', '=', '整体式刀具')]) + domain=[('product_id.cutting_tool_material_id.name', '=', '整体式刀具'), + ('quant_ids.location_id.name', 'in', ['刀具房'])]) cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号', readonly=True) integral_name = fields.Char('整体式刀具名称', readonly=True) @@ -194,14 +191,16 @@ class FunctionalToolAssemblyOrder(models.TransientModel): # 刀片型号 blade_code_id = fields.Many2one('stock.lot', '刀片序列号', - domain=[('product_id.cutting_tool_material_id.name', '=', '刀片')]) + domain=[('product_id.cutting_tool_material_id.name', '=', '刀片'), + ('quant_ids.location_id.name', 'in', ['刀具房'])]) cutting_tool_blade_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号', readonly=True) blade_name = fields.Char('刀片名称', readonly=True) sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True) # 刀杆型号 bar_code_id = fields.Many2one('stock.lot', '刀杆序列号', - domain=[('product_id.cutting_tool_material_id.name', '=', '刀杆')]) + domain=[('product_id.cutting_tool_material_id.name', '=', '刀杆'), + ('quant_ids.location_id.name', 'in', ['刀具房'])]) cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号', readonly=True) bar_name = fields.Char('刀杆名称', readonly=True) @@ -209,7 +208,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel): # 刀盘型号 pad_code_id = fields.Many2one('stock.lot', '刀盘序列号', - domain=[('product_id.cutting_tool_material_id.name', '=', '刀盘')]) + domain=[('product_id.cutting_tool_material_id.name', '=', '刀盘'), + ('quant_ids.location_id.name', 'in', ['刀具房'])]) cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号', readonly=True) pad_name = fields.Char('刀盘名称', readonly=True) @@ -217,7 +217,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel): # 刀柄型号 handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', required=True, - domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄')]) + domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄'), + ('quant_ids.location_id.name', 'in', ['刀具房'])]) cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号', readonly=True) handle_name = fields.Char('刀柄名称', readonly=True) @@ -225,7 +226,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel): # 夹头型号 chuck_code_id = fields.Many2one('stock.lot', '夹头序列号', required=True, - domain=[('product_id.cutting_tool_material_id.name', '=', '夹头')]) + domain=[('product_id.cutting_tool_material_id.name', '=', '夹头'), + ('quant_ids.location_id.name', 'in', ['刀具房'])]) cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号', readonly=True) chuck_name = fields.Char('夹头名称', readonly=True, compute='_compute_auto_fill') @@ -347,6 +349,10 @@ class FunctionalToolAssemblyOrder(models.TransientModel): ]) # 对物料做必填判断 self.materials_must_be_judged() + # # 刀具物料出库 + # if self.integral_code_id: + # print("已运行1111") + # self.tool_material_out_of_store(self.integral_code_id) # 创建组装入库单 # 创建功能刀具批次/序列号记录 @@ -359,14 +365,16 @@ class FunctionalToolAssemblyOrder(models.TransientModel): # 创建功能刀具列表记录 # 封装功能刀具数据 desc_2 = self.get_desc_2(stock_lot, functional_tool_assembly) - # 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录 + # 创建功能刀具列表记录 record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2) - # self.env['sf.real.time.distribution.of.functional.tools'].create({ - # 'functional_cutting_tool_id': record_1.id - # }) - # self.env['sf.inbound.and.outbound.records.of.functional.tools'].create({ - # 'functional_cutting_tool_id': record_1.id - # }) + # 创建安全库存信息 + self.env['sf.real.time.distribution.of.functional.tools'].create_or_edit_safety_stock({ + 'name': self.after_assembly_functional_tool_name, + 'sf_cutting_tool_type_id': self.after_assembly_functional_tool_type_id.id, + 'diameter': self.after_assembly_functional_tool_diameter, + 'knife_tip_r_angle': self.after_assembly_knife_tip_r_angle, + 'coarse_middle_thin': self.after_assembly_coarse_middle_thin, + }, record_1) # 修改功能刀具组装单信息 functional_tool_assembly.write(desc_1) @@ -430,6 +438,38 @@ class FunctionalToolAssemblyOrder(models.TransientModel): return stock_lot + # def tool_material_out_of_store(self, tool_material_serial_id): + # """ + # 刀具物料出库 + # """ + # # 获取位置 + # location_id = self.env['stock.location'].search([('name', '=', 'Stock')]) + # location_dest_id = self.env['stock.location'].search([('name', '=', '刀具组装位置')]) + # print("已运行2222") + # # 创建库存移动 + # stock_move_id = self.env['stock.move'].create({ + # 'name': '刀具物料出库', + # 'lot_id': tool_material_serial_id.id, + # 'product_id': tool_material_serial_id.product_id.id, + # 'location_id': location_id.id, + # 'location_dest_id': location_dest_id.id, + # 'product_uom_qty': 1.00, + # 'state': 'done' + # }) + # print("已运行3333") + # print(stock_move_id) + # # 创建移动历史 + # stock_move_line_id = self.env['stock.move.line'].create({ + # 'product_id': tool_material_serial_id.product_id.id, + # 'lot_id': tool_material_serial_id.id, + # 'move_id': stock_move_id.id, + # 'install_tool_time': fields.Datetime.now(), + # 'qty_done': 1.0, + # 'state': 'done' + # }) + # + # return stock_move_id, stock_move_line_id + def create_stock_quant(self, product_id, stock_lot, functional_tool_assembly): """ 创建功能刀具该批次/序列号 库存移动和移动历史