diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py index f2010b4a..3aa85ceb 100644 --- a/sf_base/models/tool_base_new.py +++ b/sf_base/models/tool_base_new.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from datetime import date from odoo import fields, models, api +from odoo.exceptions import UserError class CuttingToolMaterial(models.Model): @@ -333,3 +334,16 @@ class ToolInventory(models.Model): tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组') active = fields.Boolean('已归档', default=True) + + @api.model_create_multi + def create(self, vals_list): + # 名称重复校验 + name_list = [] + for val in vals_list: + tool_inventory = self.search([('name', '=', val['name'])]) + if tool_inventory: + name_list.append(val['name']) + if name_list: + raise UserError("功能刀具名称%s已存在，请重新输入" % name_list) + records = super(ToolInventory, self).create(vals_list) + return records diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index 9d027bdb..c0f53f98 100644 --- a/sf_base/security/ir.model.access.csv +++ b/sf_base/security/ir.model.access.csv @@ -199,4 +199,18 @@ access_group_sf_mrp_user_admin,sf_tool_inventory_admin,model_sf_tool_inventory,b access_group_sf_mrp_user_group_purchase_director,sf_tool_inventory_group_purchase_director,model_sf_tool_inventory,sf_base.group_purchase_director,1,0,1,0 access_group_sf_mrp_user_group_sale_director,sf_tool_inventory_group_sale_director,model_sf_tool_inventory,sf_base.group_sale_director,1,0,1,0 access_sf_cutting_tool_material_group_plan_director,sf_tool_inventory_group_plan_director,model_sf_tool_inventory,sf_base.group_plan_director,1,0,1,0 -access_group_sf_mrp_user_group_sf_mrp_user,sf_tool_inventory_group_sf_mrp_user,model_sf_tool_inventory,sf_base.group_sf_mrp_user,1,1,0,0 \ No newline at end of file +access_group_sf_mrp_user_group_sf_mrp_user,sf_tool_inventory_group_sf_mrp_user,model_sf_tool_inventory,sf_base.group_sf_mrp_user,1,1,0,0 + + +access_sf_fixture_material_group_purchase_director,sf_fixture_material_group_purchase_director,model_sf_fixture_material,sf_base.group_purchase_director,1,0,0,0 +access_sf_multi_mounting_type_group_purchase_director,sf_multi_mounting_type_group_purchase_director,model_sf_multi_mounting_type,sf_base.group_purchase_director,1,0,0,0 +access_sf_fixture_model_group_purchase_director,sf_fixture_model_group_purchase_director,model_sf_fixture_model,sf_base.group_purchase_director,1,0,0,0 +access_sf_fixture_materials_basic_parameters_group_purchase_director,sf_fixture_materials_basic_parameters_group_purchase_director,model_sf_fixture_materials_basic_parameters,sf_base.group_purchase_director,1,0,0,0 +access_sf_machine_tool_type_group_purchase_director,sf_machine_tool_type_group_purchase_director,model_sf_machine_tool_type,sf_base.group_purchase_director,1,0,0,0 + +access_sf_fixture_material_group_sale_director,sf_fixture_material_group_sale_director,model_sf_fixture_material,sf_base.group_sale_director,1,0,0,0 +access_sf_multi_mounting_type_group_sale_director,sf_multi_mounting_type_group_sale_director,model_sf_multi_mounting_type,sf_base.group_sale_director,1,0,0,0 +access_sf_fixture_model_group_sale_director,sf_fixture_model_group_sale_director,model_sf_fixture_model,sf_base.group_sale_director,1,0,0,0 +access_sf_fixture_materials_basic_parameters_group_sale_director,sf_fixture_materials_basic_parameters_group_sale_director,model_sf_fixture_materials_basic_parameters,sf_base.group_sale_director,1,0,0,0 +access_sf_machine_tool_type_group_sale_director,sf_machine_tool_type_group_sale_director,model_sf_machine_tool_type,sf_base.group_sale_director,1,0,0,0 + diff --git a/sf_base/views/tool_menu.xml b/sf_base/views/tool_menu.xml index bad606d6..263d11fa 100644 --- a/sf_base/views/tool_menu.xml +++ b/sf_base/views/tool_menu.xml @@ -21,7 +21,7 @@ 刀具标准库 ir.actions.act_window sf.cutting_tool.standard.library - + tree,form @@ -69,14 +69,22 @@ sequence="20" action="action_sf_cutting_tool_standard_library" /> + + - - - - - - - + + + + + + + + id="menu_sf_maintenance_equipment_image" + name="能力特征库" + parent="menu_sf_cutting_tool" + action="action_maintenance_equipment_image" + sequence="40"/> + id="menu_sf_tool_groups" + name="刀具组" + parent="menu_sf_cutting_tool" + action="sf_tool_groups_view_act" + sequence="50"/> diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml index e52a6222..1e82b8c2 100644 --- a/sf_base/views/tool_views.xml +++ b/sf_base/views/tool_views.xml @@ -609,13 +609,4 @@ tree - - - diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 99061895..bc0043c9 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -988,9 +988,9 @@ class SfWorkOrderBarcodes(models.Model): # raise UserError('该托盘已绑定工件，请先解除绑定！！！') if workorder: if workorder.routing_type == '装夹预调': - if workorder.state in ['progress', 'done']: - work_state = {'progress': '进行中', 'done': '已完工'} - raise UserError('该工单%s，不能重新绑定托盘' % work_state.get(workorder.state)) + if workorder.state in ['done']: + work_state = {'done': '已完工'} + raise UserError('装夹%s，请勿重复扫码' % work_state.get(workorder.state)) lots = self.env['stock.lot'].sudo().search([('rfid', '=', barcode)]) if lots: for lot in lots: diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 80a334ce..94a9d646 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -317,13 +317,15 @@ class ProductionLot(models.Model): """ now = datetime.now().strftime("%Y%m%d") last_serial = self.env['stock.lot'].search( - [('company_id', '=', company.id), ('product_id', '=', product.id), ('name', 'like', now)], + [('company_id', '=', company.id), ('product_id', '=', product.id)], limit=1, order='id DESC') if product.cutting_tool_model_id: + split_codes = product.cutting_tool_model_id.code.split('-') if not last_serial: - return "%s-%s%03d" % (product.cutting_tool_model_id.code[:-12], now, 1) + return "%s-T-%s-%s-%03d" % (split_codes[0], now, product.specification_id.name, 1) else: - return "%s-%s%03d" % (product.cutting_tool_model_id.code[:-12], now, int(last_serial.name[-3:]) + 1) + return "%s-T-%s-%s-%03d" % ( + split_codes[0], now, product.specification_id.name, int(last_serial.name[-3:]) + 1) else: raise ValidationError('该刀具物料产品的型号字段为空，请补充完整！！！') @@ -341,7 +343,8 @@ class ProductionLot(models.Model): return self.env['stock.lot'].generate_lot_names1(product.name, last_serial.name, 2)[1] now = datetime.now().strftime("%Y%m%d") if product.cutting_tool_model_id: - return "%s-%s%03d" % (product.cutting_tool_model_id.code[:-12], now, 1) + split_codes = product.cutting_tool_model_id.code.split('-') + return "%s-T-%s-%s-%03d" % (split_codes[0], now, product.specification_id.name, 1) return "%s-%03d" % (product.name, 1) qr_code_image = fields.Binary(string='二维码', compute='_generate_qr_code') @@ -539,6 +542,65 @@ class ReStockMove(models.Model): else: raise UserError(_("没有可打印的标签数据")) + def action_show_details(self): + """ Returns an action that will open a form view (in a popup) allowing to work on all the + move lines of a particular move. This form view is used when "show operations" is not + checked on the picking type. + """ + self.ensure_one() + + # If "show suggestions" is not checked on the picking type, we have to filter out the + # reserved move lines. We do this by displaying `move_line_nosuggest_ids`. We use + # different views to display one field or another so that the webclient doesn't have to + # fetch both. + if self.picking_type_id.show_reserved: + view = self.env.ref('stock.view_stock_move_operations') + else: + view = self.env.ref('stock.view_stock_move_nosuggest_operations') + + if self.product_id.tracking == "serial" and self.state == "assigned": + print(self.origin) + if self.product_id.categ_id.name == '刀具': + self.next_serial = self._get_tool_next_serial(self.company_id, self.product_id, self.origin) + else: + self.next_serial = self.env['stock.lot']._get_next_serial(self.company_id, self.product_id) + + return { + 'name': _('Detailed Operations'), + 'type': 'ir.actions.act_window', + 'view_mode': 'form', + 'res_model': 'stock.move', + 'views': [(view.id, 'form')], + 'view_id': view.id, + 'target': 'new', + 'res_id': self.id, + 'context': dict( + self.env.context, + show_owner=self.picking_type_id.code != 'incoming', + show_lots_m2o=self.has_tracking != 'none' and ( + self.picking_type_id.use_existing_lots or self.state == 'done' or self.origin_returned_move_id.id), + # able to create lots, whatever the value of ` use_create_lots`. + show_lots_text=self.has_tracking != 'none' and self.picking_type_id.use_create_lots and not self.picking_type_id.use_existing_lots and self.state != 'done' and not self.origin_returned_move_id.id, + show_source_location=self.picking_type_id.code != 'incoming', + show_destination_location=self.picking_type_id.code != 'outgoing', + show_package=not self.location_id.usage == 'supplier', + show_reserved_quantity=self.state != 'done' and not self.picking_id.immediate_transfer and self.picking_type_id.code != 'incoming' + ), + } + + def _get_tool_next_serial(self, company, product, origin): + """Return the next serial number to be attributed to the product.""" + if product.tracking == "serial": + last_serial = self.env['stock.lot'].search( + [('company_id', '=', company.id), ('product_id', '=', product.id), ('name', 'ilike', origin)], + limit=1, order='id DESC') + split_codes = product.cutting_tool_model_id.code.split('-') + if last_serial: + return "%s-T-%s-%s-%03d" % ( + split_codes[0], origin, product.specification_id.name, int(last_serial.name[-3:]) + 1) + else: + return "%s-T-%s-%s-%03d" % (split_codes[0], origin, product.specification_id.name, 1) + class ReStockQuant(models.Model): _inherit = 'stock.quant' diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index 8a76fe71..561f57a6 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -46,6 +46,9 @@ 1 + + + diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index e2313ba3..05523194 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -206,6 +206,16 @@ class RePurchaseOrder(models.Model): order.message_subscribe([order.partner_id.id]) return True + @api.onchange('order_line') + def _onchange_order_line(self): + for order in self: + if order.order_line: + line = order.order_line + product = line.product_id + product_id = product.ids + if len(product_id) != len(line): + raise ValidationError('【%s】已存在，请勿重复添加' % product[-1].name) + class ResPartnerToSale(models.Model): _inherit = 'res.partner' diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py index fe65c05e..fc556283 100644 --- a/sf_tool_management/__manifest__.py +++ b/sf_tool_management/__manifest__.py @@ -16,6 +16,7 @@ 'security/ir.model.access.csv', 'wizard/wizard_view.xml', 'views/tool_base_views.xml', + 'views/functional_tool_views.xml', 'views/mrp_workcenter_views.xml', 'views/sf_maintenance_equipment.xml', 'views/menu_view.xml', diff --git a/sf_tool_management/controllers/controllers.py b/sf_tool_management/controllers/controllers.py index 0b003dc6..c8d6ee3f 100644 --- a/sf_tool_management/controllers/controllers.py +++ b/sf_tool_management/controllers/controllers.py @@ -22,14 +22,14 @@ class Manufacturing_Connect(http.Controller): ret = json.loads(datas) # ret = json.loads(ret['result']) logging.info('DeviceId:%s' % ret) - functional_tools = request.env['sf.functional.cutting.tool.entity'].sudo().search([]) + functional_tools = request.env['sf.tool.inventory'].sudo().search([]) res = {'Succeed': True, 'Datas': []} if functional_tools: for item in functional_tools: res['Datas'].append({ 'GroupName': item.tool_groups_id.name, - 'ToolId': item.code, + 'ToolId': item.functional_cutting_tool_model_id.name, 'ToolName': item.name }) except Exception as e: diff --git a/sf_tool_management/models/__init__.py b/sf_tool_management/models/__init__.py index f73f5e3d..b589e095 100644 --- a/sf_tool_management/models/__init__.py +++ b/sf_tool_management/models/__init__.py @@ -1,4 +1,5 @@ from . import base +from . import functional_tool from . import tool_material_search from . import maintenance_equipment from . import mrp_workorder diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index d90c65bd..56391077 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -1,477 +1,8 @@ # -*- coding: utf-8 -*- -import re -import json -import requests from datetime import timedelta from odoo import SUPERUSER_ID from odoo import fields, models, api from odoo.exceptions import ValidationError -from odoo.addons.sf_base.commons.common import Common - - -class FunctionalCuttingToolEntity(models.Model): - _name = 'sf.functional.cutting.tool.entity' - _description = '功能刀具列表' - - tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id') - code = fields.Char('编码') - rfid = fields.Char('Rfid', readonly=True) - name = fields.Char('名称') - functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称', readonly=True) - barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) - sf_cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具型号') - sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', - group_expand='_read_group_mrs_cutting_tool_type_id', compute_sudo=True) - - functional_tool_diameter = fields.Integer(string='刀具直径(mm)', readonly=True) - knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True) - coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True) - new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True) - tool_loading_length = fields.Float(string='总长度(mm)', readonly=True) - functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True) - effective_length = fields.Float(string='有效长(mm)', readonly=True) - tool_room_num = fields.Integer(string='刀具房数量', readonly=True) - line_edge_knife_library_num = fields.Integer(string='线边刀库数量', readonly=True) - machine_knife_library_num = fields.Integer(string='机内刀库数量', readonly=True) - max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True) - alarm_value = fields.Integer(string='报警值(min)', readonly=True) - used_value = fields.Integer(string='已使用值(min)', readonly=True) - functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警'), ('已拆除', '已拆除')], - string='状态', store=True, default='正常') - current_location_id = fields.Many2one('stock.location', string='当前位置', readonly=True) - current_location = fields.Selection( - [('组装后', '组装后'), ('刀具房', '刀具房'), ('线边刀库', '线边刀库'), ('机内刀库', '机内刀库')], - string='位置', compute='_compute_current_location_id', store=True) - image = fields.Binary('图片', readonly=True) - - active = fields.Boolean(string='已归档', default=True) - - @api.depends('barcode_id.quant_ids') - def _compute_current_location_id(self): - for record in self: - if record.barcode_id.quant_ids: - for quant_id in record.barcode_id.quant_ids: - if quant_id.inventory_quantity_auto_apply > 0: - record.current_location_id = quant_id.location_id - if quant_id.location_id.name == '制造前': - record.current_location = '机内刀库' - else: - record.current_location = quant_id.location_id.name - if record.current_location_id: - record.sudo().get_location_num() - else: - record.current_location_id = False - record.current_location = False - - def get_location_num(self): - """ - 计算库存位置数量 - """ - for obj in self: - if obj.current_location_id: - obj.tool_room_num = 0 - obj.line_edge_knife_library_num = 0 - obj.machine_knife_library_num = 0 - if obj.current_location in ['刀具房']: - obj.tool_room_num = 1 - elif "线边刀库" in obj.current_location: - obj.line_edge_knife_library_num = 1 - elif "机内刀库" in obj.current_location: - obj.machine_knife_library_num = 1 - - @api.model - def _read_group_mrs_cutting_tool_type_id(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) - - # 整体式刀具型号 - cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '整体式刀具')]) - # 刀片型号 - cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀片')]) - # 刀杆型号 - cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀杆')]) - # 刀盘型号 - cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀盘')]) - # 刀柄型号 - cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '刀柄')]) - # 夹头型号 - cutting_tool_cutterhead_model_id = fields.Many2one('product.product', string='夹头型号', readonly=True, - domain=[('cutting_tool_material_id', '=', '夹头')]) - - whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True) - L_D_number = fields.Float(string='L/D值(mm)', readonly=True) - hiding_length = fields.Float(string='避空长(mm)', readonly=True) - cut_time = fields.Integer(string='已切削时间(min)', readonly=True) - cut_length = fields.Float(string='已切削长度(mm)', readonly=True) - cut_number = fields.Integer(string='已切削次数', readonly=True) - - suitable_machining_method_ids = fields.Many2many( - 'maintenance.equipment.image', 'rel_machining_product_template_tool_entity', '适合加工方式', - domain=[('type', '=', '加工能力')], compute='_compute_maintenance_equipment_image') - blade_tip_characteristics_id = fields.Many2one( - 'maintenance.equipment.image', '刀尖特征', - domain=[('type', '=', '刀尖特征')]) - handle_type_id = fields.Many2one( - 'maintenance.equipment.image', '柄部类型', - domain=[('type', '=', '柄部类型')]) - cutting_direction_ids = fields.Many2many( - 'maintenance.equipment.image', 'rel_cutting_product_template_tool_entity', '走刀方向', - domain=[('type', '=', '走刀方向')]) - suitable_coolant_ids = fields.Many2many( - 'maintenance.equipment.image', 'rel_coolants_product_template_tool_entity', '适合冷却方式', - domain=[('type', '=', '冷却方式')]) - - @api.depends('cutting_tool_integral_model_id', 'cutting_tool_blade_model_id') - def _compute_maintenance_equipment_image(self): - for record in self: - if record.cutting_tool_integral_model_id: - print(record.cutting_tool_integral_model_id) - record.sudo().suitable_machining_method_ids = record.cutting_tool_integral_model_id.suitable_machining_method_ids.ids - record.sudo().blade_tip_characteristics_id = record.cutting_tool_integral_model_id.blade_tip_characteristics_id.id - record.sudo().handle_type_id = record.cutting_tool_integral_model_id.handle_type_id.id - record.sudo().cutting_direction_ids = record.cutting_tool_integral_model_id.cutting_direction_ids.ids - record.sudo().suitable_coolant_ids = record.cutting_tool_integral_model_id.suitable_coolant_ids.ids - print(record.cutting_tool_integral_model_id.blade_tip_characteristics_id.ids) - elif record.cutting_tool_blade_model_id: - record.sudo().suitable_machining_method_ids = record.cutting_tool_blade_model_id.suitable_machining_method_ids.ids - record.sudo().blade_tip_characteristics_id = record.cutting_tool_blade_model_id.blade_tip_characteristics_id.id - record.sudo().handle_type_id = record.cutting_tool_blade_model_id.handle_type_id.id - record.sudo().cutting_direction_ids = record.cutting_tool_blade_model_id.cutting_direction_ids.ids - record.sudo().suitable_coolant_ids = record.cutting_tool_blade_model_id.suitable_coolant_ids.ids - else: - record.sudo().suitable_machining_method_ids = [] - record.sudo().blade_tip_characteristics_id = None - record.sudo().handle_type_id = None - record.sudo().cutting_direction_ids = [] - record.sudo().suitable_coolant_ids = [] - - def _get_functional_tool_model_ids(self, functional_tool_model_code): - functional_tool_model_ids = [] - for item in functional_tool_model_code: - functional_tool_model = self.env['sf.cutting_tool.standard.library'].search([('code', '=', item)]) - functional_tool_model_ids.append(functional_tool_model.id) - return [(6, 0, functional_tool_model_ids)] - - def open_functional_tool_warning(self): - action = self.env.ref('sf_tool_management.action_sf_functional_tool_warning') - result = action.read()[0] - result['domain'] = [('functional_tool_name_id', '=', self.functional_tool_name_id.id)] - return result - - def open_stock_move_line(self): - action = self.env.ref('sf_tool_management.sf_inbound_and_outbound_records_of_functional_tools_view_act') - result = action.read()[0] - 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 - - def tool_inventory_displacement_out(self): - """ - 机床当前刀库实时信息接口，功能刀具出库 - """ - # 获取位置对象 - location_inventory_id = self.current_location_id - stock_location_id = self.env['stock.location'].search([('name', '=', '制造前')]) - # 创建功能刀具该批次/序列号 库存移动和移动历史 - self.barcode_id.create_stock_quant(location_inventory_id, stock_location_id, - self.functional_tool_name_id.id, '机床装刀', self.functional_tool_name_id) - - # ==========刀具组接口========== - # def _register_functional_tool_groups(self, obj): - # create_url = '/AutoDeviceApi/ToolGroup' - # sf_sync_config = self.env['res.config.settings'].get_values() - # token = sf_sync_config['token'] - # sf_secret_key = sf_sync_config['sf_secret_key'] - # headers = Common.get_headers(obj, token, sf_secret_key) - # strurl = sf_sync_config['sf_url'] + create_url - # val = { - # 'ToolName': obj.name, - # 'GroupName': obj.tool_groups_id.name, - # 'ToolId': obj.code - # } - # kw = json.dumps(val, ensure_ascii=False) - # r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers) - # ret = r.json() - # if r == 200: - # return "刀具组发送成功" - # else: - # raise ValidationError("刀具组发送失败") - - # @api.model_create_multi - # def create(self, vals): - # obj = super(FunctionalCuttingToolEntity, self).create(vals) - # # 调用刀具组接口 - # self._register_functional_tool_groups(obj) - # return obj - - -class FunctionalToolWarning(models.Model): - _name = 'sf.functional.tool.warning' - _description = '功能刀具预警' - - code = fields.Char('编码', related='functional_tool_name_id.code') - rfid = fields.Char('Rfid', related='functional_tool_name_id.rfid') - tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id') - name = fields.Char('名称', invisible=True, readonly=True, related='functional_tool_name_id.name') - # 机床信息 - production_line_id = fields.Many2one('sf.production.line', string='生产线', - group_expand='_read_group_machine_table_name_ids') - maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床') - machine_tool_code = fields.Char(string='机台号', related='maintenance_equipment_id.name') - machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型', - related='maintenance_equipment_id.category_id') - cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', - domain="[('equipment_id', '=', maintenance_equipment_id)]") - # 功能刀具信息 - functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称') - barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', related='functional_tool_name_id.barcode_id') - mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型') - diameter = fields.Integer(string='刀具直径(mm)') - knife_tip_r_angle = fields.Float(string='刀尖R角(mm)') - # 其他信息 - install_tool_time = fields.Datetime("刀具组装时间", related='functional_tool_name_id.tool_loading_time') - on_board_time = fields.Datetime('上机装刀时间') - max_lifetime_value = fields.Integer(string='最大寿命值(min)') - alarm_value = fields.Integer(string='报警值(min)') - used_value = fields.Integer(string='已使用值(min)') - functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警'), ('已拆除', '已拆除')], string='状态') - alarm_time = fields.Datetime('报警时间') - dispose_user = fields.Char('处理人') - dispose_time = fields.Char('处理时间') - dispose_func = fields.Char('处理方法/措施', readonly=False) - - active = fields.Boolean(string='已归档', default=True) - - @api.model - def _read_group_machine_table_name_ids(self, categories, domain, order): - machine_table_name_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) - return categories.browse(machine_table_name_ids) - - def create_tool_warning_record(self, obj): - """ - 机台换刀申请报警状态时，创建功能刀具预警记录 - """ - if obj: - for tool in obj.get('tool_changing_apply_id'): - self.env['sf.functional.tool.warning'].create({ - 'production_line_id': tool.production_line_id.id, - 'maintenance_equipment_id': tool.maintenance_equipment_id.id, - 'machine_tool_code': tool.machine_tool_code, - 'machine_table_type_id': tool.machine_table_type_id.id, - 'cutter_spacing_code_id': tool.cutter_spacing_code_id.id, - 'functional_tool_name_id': tool.functional_tool_name_id.id, - 'barcode_id': tool.barcode_id.id, - 'diameter': tool.diameter, - 'knife_tip_r_angle': tool.knife_tip_r_angle, - 'max_lifetime_value': tool.max_lifetime_value, - 'alarm_value': tool.alarm_value, - 'used_value': tool.used_value, - 'functional_tool_status': tool.functional_tool_status, - 'alarm_time': fields.Datetime.now(), - }) - - -class StockMoveLine(models.Model): - _inherit = 'stock.move.line' - _description = '功能刀具出入库记录' - _order = 'date desc' - - functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称') - functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True, - group_expand='_read_group_functional_tool_type_id') - functional_tool_name = fields.Char('刀具名称') - diameter = fields.Integer(string='刀具直径(mm)') - knife_tip_r_angle = fields.Float(string='刀尖R角(mm)') - install_tool_time = fields.Datetime("刀具组装时间", default=fields.Datetime.now()) - code = fields.Char('编码') - rfid = fields.Char('Rfid') - tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组') - - @api.model - def _read_group_functional_tool_type_id(self, categories, domain, order): - names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) - return categories.browse(names) - - -class RealTimeDistributionOfFunctionalTools(models.Model): - _name = 'sf.real.time.distribution.of.functional.tools' - _description = '功能刀具安全库存' - - name = fields.Char('名称', readonly=True, compute='_compute_name', store=True) - functional_name_id = fields.Many2one('sf.tool.inventory', string='功能刀具名称', required=True) - tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=False, required=True) - sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False, - group_expand='_read_mrs_cutting_tool_type_ids', store=True) - diameter = fields.Integer(string='刀具直径(mm)', readonly=False) - knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=False) - 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) - min_stock_num = fields.Integer('最低库存量') - max_stock_num = fields.Integer('最高库存量') - batch_replenishment_num = fields.Integer('批次补货量', readonly=True, compute='_compute_batch_replenishment_num') - unit = fields.Char('单位') - image = fields.Binary('图片', readonly=False) - - coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False) - whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=False) - # 能力特征信息 - 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.Many2one( - 'maintenance.equipment.image', '刀尖特征', - domain=[('type', '=', '刀尖特征')], - related='sf_functional_cutting_tool_entity_ids.blade_tip_characteristics_id') - handle_type_id = fields.Many2one( - 'maintenance.equipment.image', '柄部类型', - domain=[('type', '=', '柄部类型')], related='sf_functional_cutting_tool_entity_ids.handle_type_id') - 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_coolants_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) - - sf_functional_tool_assembly_ids = fields.Many2many('sf.functional.tool.assembly', 'sf_functional_tool_assembly_ref', - '功能刀具组装单', readonly=True) - - active = fields.Boolean(string='已归档', default=True) - - @api.depends('functional_name_id') - def _compute_name(self): - for obj in self: - if obj.tool_groups_id: - obj.name = obj.functional_name_id.name - else: - obj.sudo().name = '' - - @api.constrains('min_stock_num', 'max_stock_num') - def _check_stock_num(self): - for obj in self: - if obj.min_stock_num > obj.max_stock_num: - raise ValidationError('【最低安全库存】不能高于【最高安全库存】！！!') - - @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('sf_functional_cutting_tool_entity_ids', 'min_stock_num', 'max_stock_num') - def _compute_batch_replenishment_num(self): - for tool in self: - if tool: - # 判断功能刀具组装单是否已经完成 - tool.sudo().estimate_functional_tool_assembly_ids(tool) - tool.sudo().get_stock_num(tool) - # 计算当前库存量 - tool.sudo().tool_stock_total = tool.tool_stock_num + tool.side_shelf_num + tool.on_tool_stock_num - # 如果当前库存量小于最低库存量，计算批次补货量 - tool.sudo().open_batch_replenishment_num(tool) - - def open_batch_replenishment_num(self, tool): - """ - 计算批次补货量 - """ - if tool.tool_stock_total < tool.min_stock_num: - tool.sudo().batch_replenishment_num = tool.max_stock_num - tool.tool_stock_total - # 根据判断创建功能刀具组装单 - if not tool.sf_functional_tool_assembly_ids and re.match(r'^\d+$', str(tool.id)): - for i in range(tool.batch_replenishment_num): - tool.sudo().create_functional_tool_assembly(tool) - print(i, ": ", tool.sf_functional_tool_assembly_ids) - else: - tool.sudo().batch_replenishment_num = 0 - - def create_functional_tool_assembly(self, tool): - """ - 创建功能刀具组装单 - """ - functional_tool_assembly = tool.env['sf.functional.tool.assembly'].sudo().create({ - 'functional_tool_name': tool.name, - 'functional_tool_type_id': tool.sf_cutting_tool_type_id.id, - 'tool_groups_id': tool.tool_groups_id.id, - 'functional_tool_diameter': tool.diameter, - 'knife_tip_r_angle': tool.knife_tip_r_angle, - 'coarse_middle_thin': tool.coarse_middle_thin, - 'loading_task_source': '2', - 'use_tool_time': fields.Datetime.now() + timedelta(hours=4), - 'applicant': '系统自动', - 'apply_time': fields.Datetime.now(), - 'whether_standard_knife': tool.whether_standard_knife, - 'reason_for_applying': '安全库存', - }) - tool.sudo().sf_functional_tool_assembly_ids = [(4, functional_tool_assembly.id)] - - def estimate_functional_tool_assembly_ids(self, tool): - """ - 判断功能刀具组装单是否完成，如果全部完成清空sf_functional_tool_assembly_ids的数据 - """ - for sf_functional_tool_assembly_id in tool.sf_functional_tool_assembly_ids: - if sf_functional_tool_assembly_id.assemble_status == '0': - return False - tool.sudo().sf_functional_tool_assembly_ids = [] - - def get_stock_num(self, tool): - """ - 计算刀具房数量、线边刀库数量、机内刀库数量 - """ - if tool: - tool.tool_stock_num = 0 - tool.side_shelf_num = 0 - tool.on_tool_stock_num = 0 - if tool.sf_functional_cutting_tool_entity_ids: - for cutting_tool in tool.sf_functional_cutting_tool_entity_ids: - if cutting_tool.tool_room_num > 0: - tool.tool_stock_num += 1 - elif cutting_tool.line_edge_knife_library_num > 0: - tool.side_shelf_num += 1 - elif cutting_tool.machine_knife_library_num > 0: - tool.on_tool_stock_num += 1 - - def create_or_edit_safety_stock(self, vals, sf_functional_cutting_tool_entity_ids): - """ - 根据传入的信息新增或者更新功能刀具安全库存的信息 - """ - # 根据功能刀具名称、刀具组、直径或尖刀R角、粗/中/精查询该功能刀具是否已经存在 - record = self.env['sf.real.time.distribution.of.functional.tools'].search( - [('functional_name_id', '=', vals['functional_name_id']), - ('sf_cutting_tool_type_id', '=', vals['sf_cutting_tool_type_id']), - ('diameter', '=', vals['diameter']), ('knife_tip_r_angle', '=', vals['knife_tip_r_angle']), - ('coarse_middle_thin', '=', vals['coarse_middle_thin']), ('tool_groups_id', '=', vals['tool_groups_id'])]) - 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) - - status_create = fields.Boolean('是否是新增状态', default=True) - - @api.model_create_multi - def create(self, vals_list): - for vals in vals_list: - vals['status_create'] = False - records = super(RealTimeDistributionOfFunctionalTools, self).create(vals_list) - return records class MachineTableToolChangingApply(models.Model): @@ -819,12 +350,12 @@ class FunctionalToolAssembly(models.Model): @api.depends('functional_tool_name') def _compute_name(self): for obj in self: - obj.name = obj.after_assembly_functional_tool_name + obj.name = obj.assembly_order_code code = fields.Char('功能刀具编码', readonly=True) rfid = fields.Char('Rfid', readonly=True) tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True) - name = fields.Char(string='名称', readonly=True, compute='_compute_name', store=True) + name = fields.Char(string='名称', readonly=True, compute='_compute_name') assembly_order_code = fields.Char(string='组装单编码', readonly=True) functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True) @@ -864,56 +395,136 @@ class FunctionalToolAssembly(models.Model): return categories.browse(functional_tool_type_ids) # 刀具物料信息 - # 整体式刀具型号 - integral_code_id = fields.Many2one('stock.lot', string='整体式刀具序列号', readonly=True) + # ==============整体式刀具型号============ + integral_freight_barcode = fields.Char('整体式刀具货位') + integral_product_id = fields.Many2one('product.product', string='整体式刀具名称', + compute='_compute_integral_product_id', store=True) cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号', - related='integral_code_id.product_id.cutting_tool_model_id') - integral_name = fields.Char('整体式刀具名称', related='integral_code_id.product_id.name') + related='integral_product_id.cutting_tool_model_id') integral_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='整体式刀具规格', - related='integral_code_id.product_id.specification_id') + related='integral_product_id.specification_id') sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', string='整体式刀具品牌', - related='integral_code_id.product_id.brand_id') - # 刀片型号 - blade_code_id = fields.Many2one('stock.lot', '刀片序列号', readonly=True) - cutting_tool_blade_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号', - related='blade_code_id.product_id.cutting_tool_model_id') - blade_name = fields.Char('刀片名称', related='blade_code_id.product_id.name') - blade_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀片规格', - related='blade_code_id.product_id.specification_id') - sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', related='blade_code_id.product_id.brand_id') - # 刀杆型号 - bar_code_id = fields.Many2one('stock.lot', '刀杆序列号', readonly=True) - cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号', - related='bar_code_id.product_id.cutting_tool_model_id') - bar_name = fields.Char('刀杆名称', related='bar_code_id.product_id.name') - bar_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀杆规格', - related='bar_code_id.product_id.specification_id') - sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', related='bar_code_id.product_id.brand_id') - # 刀盘型号 - pad_code_id = fields.Many2one('stock.lot', '刀盘序列号', readonly=True) - cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号', - related='pad_code_id.product_id.cutting_tool_model_id') - pad_name = fields.Char('刀盘名称', related='pad_code_id.product_id.name') - pad_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀盘规格', - related='pad_code_id.product_id.specification_id') - sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', related='pad_code_id.product_id.brand_id') - # 刀柄型号 - handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', readonly=True) - cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号', - related='handle_code_id.product_id.cutting_tool_model_id') - handle_name = fields.Char('刀柄名称', related='handle_code_id.product_id.name') - handle_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀柄规格', - related='handle_code_id.product_id.specification_id') - sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', related='handle_code_id.product_id.brand_id') - # 夹头型号 - chuck_code_id = fields.Many2one('stock.lot', '夹头序列号', readonly=True) - cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号', - related='chuck_code_id.product_id.cutting_tool_model_id') - chuck_name = fields.Char('夹头名称', related='chuck_code_id.product_id.name') - chuck_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='夹头规格', - related='chuck_code_id.product_id.specification_id') - sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', related='chuck_code_id.product_id.brand_id') + related='integral_product_id.brand_id') + @api.depends('integral_freight_barcode') + def _compute_integral_product_id(self): + for item in self: + location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', item.integral_freight_barcode)]) + if location: + item.integral_product_id = location.product_id.id + else: + item.integral_product_id = False + + # =================刀片型号============= + blade_freight_barcode = fields.Char('刀片货位') + blade_product_id = fields.Many2one('product.product', string='刀片名称', compute='_compute_blade_product_id', + store=True) + cutting_tool_blade_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号', + related='blade_product_id.cutting_tool_model_id') + blade_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀片规格', + related='blade_product_id.specification_id') + sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', related='blade_product_id.brand_id') + + @api.depends('blade_freight_barcode') + def _compute_blade_product_id(self): + for item in self: + location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', item.blade_freight_barcode)]) + if location: + item.blade_product_id = location.product_id.id + else: + item.blade_product_id = False + + # ==============刀杆型号================ + bar_freight_barcode = fields.Char('刀杆货位') + bar_product_id = fields.Many2one('product.product', string='刀杆名称', compute='_compute_bar_product_id', + store=True) + cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号', + related='bar_product_id.cutting_tool_model_id') + bar_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀杆规格', + related='bar_product_id.specification_id') + sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', related='bar_product_id.brand_id') + + @api.depends('bar_freight_barcode') + def _compute_bar_product_id(self): + for item in self: + location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', item.bar_freight_barcode)]) + if location: + item.bar_product_id = location.product_id.id + else: + item.bar_product_id = False + + # =============刀盘型号================ + pad_freight_barcode = fields.Char('刀盘货位') + pad_product_id = fields.Many2one('product.product', string='刀盘名称', compute='_compute_pad_product_id', + store=True) + cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号', + related='pad_product_id.cutting_tool_model_id') + pad_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀盘规格', + related='pad_product_id.specification_id') + sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', related='pad_product_id.brand_id') + + @api.depends('pad_freight_barcode') + def _compute_pad_product_id(self): + for item in self: + location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', item.pad_freight_barcode)]) + if location: + item.pad_product_id = location.product_id.id + else: + item.pad_product_id = False + + # ==============刀柄型号============== + handle_freight_rfid = fields.Char('刀柄Rfid', compute='_compute_handle_product_id', store=True) + handle_code_id = fields.Many2one('stock.lot', '刀柄序列号') + handle_product_id = fields.Many2one('product.product', string='刀柄名称', compute='_compute_handle_product_id', + store=True) + cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号', + related='handle_product_id.cutting_tool_model_id') + handle_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀柄规格', + related='handle_product_id.specification_id') + sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', related='handle_product_id.brand_id') + + @api.depends('handle_code_id') + def _compute_handle_product_id(self): + for item in self: + if item.handle_code_id: + item.handle_product_id = item.handle_code_id.product_id.id + item.handle_freight_rfid = item.handle_code_id.rfid + else: + item.handle_product_id = False + item.handle_freight_rfid = False + + # ==============夹头型号============== + chuck_freight_barcode = fields.Char('夹头货位') + chuck_product_id = fields.Many2one('product.product', string='夹头名称', compute='_compute_chuck_product_id', + store=True) + cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号', + related='chuck_product_id.cutting_tool_model_id') + chuck_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='夹头规格', + related='chuck_product_id.specification_id') + sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', related='chuck_product_id.brand_id') + + @api.depends('chuck_freight_barcode') + def _compute_chuck_product_id(self): + for item in self: + location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', item.chuck_freight_barcode)]) + if location: + item.chuck_product_id = location.product_id.id + else: + item.chuck_product_id = False + + # ==================待删除字段================== + blade_name = fields.Char('') + integral_name = fields.Char('') + blade_code_id = fields.Many2one('stock.lot', '刀片序列号') + integral_code_id = fields.Many2one('stock.lot', '整体式刀具序列号') + bar_code_id = fields.Many2one('stock.lot', '刀杆序列号') + bar_name = fields.Char('') + pad_code_id = fields.Many2one('stock.lot', '刀盘序列号') + pad_name = fields.Char('') + handle_name = fields.Char('') + chuck_code_id = fields.Many2one('stock.lot', '夹头序列号') + chuck_name = fields.Char('') + # ============================================== # 组装功能刀具参数信息 barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True) diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py new file mode 100644 index 00000000..c37d5317 --- /dev/null +++ b/sf_tool_management/models/functional_tool.py @@ -0,0 +1,481 @@ +# -*- coding: utf-8 -*- +import re +from datetime import timedelta +from odoo import SUPERUSER_ID +from odoo import fields, models, api +from odoo.exceptions import ValidationError + + +class FunctionalCuttingToolEntity(models.Model): + _name = 'sf.functional.cutting.tool.entity' + _description = '功能刀具列表' + + functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具组装单', readonly=True) + tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id') + code = fields.Char('编码') + rfid = fields.Char('Rfid', readonly=True) + name = fields.Char('名称') + tool_name_id = fields.Many2one('sf.tool.inventory', '功能刀具名称') + sf_cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具型号') + barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) + sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', + group_expand='_read_group_mrs_cutting_tool_type_id', compute_sudo=True) + + functional_tool_diameter = fields.Integer(string='刀具直径(mm)', readonly=True) + knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True) + coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True) + new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True) + tool_loading_length = fields.Float(string='总长度(mm)', readonly=True) + functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True) + effective_length = fields.Float(string='有效长(mm)', readonly=True) + tool_room_num = fields.Integer(string='刀具房数量', readonly=True) + line_edge_knife_library_num = fields.Integer(string='线边刀库数量', readonly=True) + machine_knife_library_num = fields.Integer(string='机内刀库数量', readonly=True) + max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True) + alarm_value = fields.Integer(string='报警值(min)', readonly=True) + used_value = fields.Integer(string='已使用值(min)', readonly=True) + functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警'), ('已拆除', '已拆除')], + string='状态', store=True, default='正常') + current_location_id = fields.Many2one('stock.location', string='当前位置', readonly=True) + current_location = fields.Selection( + [('组装后', '组装后'), ('刀具房', '刀具房'), ('线边刀库', '线边刀库'), ('机内刀库', '机内刀库')], + string='位置', compute='_compute_current_location_id', store=True) + image = fields.Binary('图片', readonly=True) + + active = fields.Boolean(string='已归档', default=True) + + @api.depends('barcode_id.quant_ids') + def _compute_current_location_id(self): + for record in self: + if record.barcode_id.quant_ids: + for quant_id in record.barcode_id.quant_ids: + if quant_id.inventory_quantity_auto_apply > 0: + record.current_location_id = quant_id.location_id + if quant_id.location_id.name == '制造前': + record.current_location = '机内刀库' + else: + record.current_location = quant_id.location_id.name + if record.current_location_id: + record.sudo().get_location_num() + else: + record.current_location_id = False + record.current_location = False + + def get_location_num(self): + """ + 计算库存位置数量 + """ + for obj in self: + if obj.current_location_id: + obj.tool_room_num = 0 + obj.line_edge_knife_library_num = 0 + obj.machine_knife_library_num = 0 + if obj.current_location in ['刀具房']: + obj.tool_room_num = 1 + elif "线边刀库" in obj.current_location: + obj.line_edge_knife_library_num = 1 + elif "机内刀库" in obj.current_location: + obj.machine_knife_library_num = 1 + + @api.model + def _read_group_mrs_cutting_tool_type_id(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) + + # 整体式刀具型号 + cutting_tool_integral_model_id = fields.Many2one('product.product', string='整体式刀具型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '整体式刀具')]) + # 刀片型号 + cutting_tool_blade_model_id = fields.Many2one('product.product', string='刀片型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀片')]) + # 刀杆型号 + cutting_tool_cutterbar_model_id = fields.Many2one('product.product', string='刀杆型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀杆')]) + # 刀盘型号 + cutting_tool_cutterpad_model_id = fields.Many2one('product.product', string='刀盘型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀盘')]) + # 刀柄型号 + cutting_tool_cutterhandle_model_id = fields.Many2one('product.product', string='刀柄型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '刀柄')]) + # 夹头型号 + cutting_tool_cutterhead_model_id = fields.Many2one('product.product', string='夹头型号', readonly=True, + domain=[('cutting_tool_material_id', '=', '夹头')]) + + whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True) + L_D_number = fields.Float(string='L/D值(mm)', readonly=True) + hiding_length = fields.Float(string='避空长(mm)', readonly=True) + cut_time = fields.Integer(string='已切削时间(min)', readonly=True) + cut_length = fields.Float(string='已切削长度(mm)', readonly=True) + cut_number = fields.Integer(string='已切削次数', readonly=True) + + suitable_machining_method_ids = fields.Many2many( + 'maintenance.equipment.image', 'rel_machining_product_template_tool_entity', '适合加工方式', + domain=[('type', '=', '加工能力')], compute='_compute_maintenance_equipment_image') + blade_tip_characteristics_id = fields.Many2one( + 'maintenance.equipment.image', '刀尖特征', + domain=[('type', '=', '刀尖特征')]) + handle_type_id = fields.Many2one( + 'maintenance.equipment.image', '柄部类型', + domain=[('type', '=', '柄部类型')]) + cutting_direction_ids = fields.Many2many( + 'maintenance.equipment.image', 'rel_cutting_product_template_tool_entity', '走刀方向', + domain=[('type', '=', '走刀方向')]) + suitable_coolant_ids = fields.Many2many( + 'maintenance.equipment.image', 'rel_coolants_product_template_tool_entity', '适合冷却方式', + domain=[('type', '=', '冷却方式')]) + + @api.depends('cutting_tool_integral_model_id', 'cutting_tool_blade_model_id') + def _compute_maintenance_equipment_image(self): + for record in self: + if record.cutting_tool_integral_model_id: + print(record.cutting_tool_integral_model_id) + record.sudo().suitable_machining_method_ids = record.cutting_tool_integral_model_id.suitable_machining_method_ids.ids + record.sudo().blade_tip_characteristics_id = record.cutting_tool_integral_model_id.blade_tip_characteristics_id.id + record.sudo().handle_type_id = record.cutting_tool_integral_model_id.handle_type_id.id + record.sudo().cutting_direction_ids = record.cutting_tool_integral_model_id.cutting_direction_ids.ids + record.sudo().suitable_coolant_ids = record.cutting_tool_integral_model_id.suitable_coolant_ids.ids + print(record.cutting_tool_integral_model_id.blade_tip_characteristics_id.ids) + elif record.cutting_tool_blade_model_id: + record.sudo().suitable_machining_method_ids = record.cutting_tool_blade_model_id.suitable_machining_method_ids.ids + record.sudo().blade_tip_characteristics_id = record.cutting_tool_blade_model_id.blade_tip_characteristics_id.id + record.sudo().handle_type_id = record.cutting_tool_blade_model_id.handle_type_id.id + record.sudo().cutting_direction_ids = record.cutting_tool_blade_model_id.cutting_direction_ids.ids + record.sudo().suitable_coolant_ids = record.cutting_tool_blade_model_id.suitable_coolant_ids.ids + else: + record.sudo().suitable_machining_method_ids = [] + record.sudo().blade_tip_characteristics_id = None + record.sudo().handle_type_id = None + record.sudo().cutting_direction_ids = [] + record.sudo().suitable_coolant_ids = [] + + def _get_functional_tool_model_ids(self, functional_tool_model_code): + functional_tool_model_ids = [] + for item in functional_tool_model_code: + functional_tool_model = self.env['sf.cutting_tool.standard.library'].search([('code', '=', item)]) + functional_tool_model_ids.append(functional_tool_model.id) + return [(6, 0, functional_tool_model_ids)] + + def open_functional_tool_warning(self): + action = self.env.ref('sf_tool_management.action_sf_functional_tool_warning') + result = action.read()[0] + result['domain'] = [('functional_tool_name_id', '=', self.functional_tool_name_id.id)] + return result + + def open_stock_move_line(self): + action = self.env.ref('sf_tool_management.sf_inbound_and_outbound_records_of_functional_tools_view_act') + result = action.read()[0] + 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 + + def tool_inventory_displacement_out(self): + """ + 机床当前刀库实时信息接口，功能刀具出库 + """ + # 获取位置对象 + location_inventory_id = self.current_location_id + stock_location_id = self.env['stock.location'].search([('name', '=', '制造前')]) + # 创建功能刀具该批次/序列号 库存移动和移动历史 + self.barcode_id.create_stock_quant(location_inventory_id, stock_location_id, + self.functional_tool_name_id.id, '机床装刀', self.functional_tool_name_id) + + # ==========刀具组接口========== + # def _register_functional_tool_groups(self, obj): + # create_url = '/AutoDeviceApi/ToolGroup' + # sf_sync_config = self.env['res.config.settings'].get_values() + # token = sf_sync_config['token'] + # sf_secret_key = sf_sync_config['sf_secret_key'] + # headers = Common.get_headers(obj, token, sf_secret_key) + # strurl = sf_sync_config['sf_url'] + create_url + # val = { + # 'ToolName': obj.name, + # 'GroupName': obj.tool_groups_id.name, + # 'ToolId': obj.code + # } + # kw = json.dumps(val, ensure_ascii=False) + # r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers) + # ret = r.json() + # if r == 200: + # return "刀具组发送成功" + # else: + # raise ValidationError("刀具组发送失败") + + # @api.model_create_multi + # def create(self, vals): + # obj = super(FunctionalCuttingToolEntity, self).create(vals) + # # 调用刀具组接口 + # self._register_functional_tool_groups(obj) + # return obj + + +class FunctionalToolWarning(models.Model): + _name = 'sf.functional.tool.warning' + _description = '功能刀具预警' + + code = fields.Char('编码', related='functional_tool_name_id.code') + rfid = fields.Char('Rfid', related='functional_tool_name_id.rfid') + tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id') + name = fields.Char('名称', invisible=True, readonly=True, related='functional_tool_name_id.name') + # 机床信息 + production_line_id = fields.Many2one('sf.production.line', string='生产线', + group_expand='_read_group_machine_table_name_ids') + maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床') + machine_tool_code = fields.Char(string='机台号', related='maintenance_equipment_id.name') + machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型', + related='maintenance_equipment_id.category_id') + cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', + domain="[('equipment_id', '=', maintenance_equipment_id)]") + # 功能刀具信息 + functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称') + barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', related='functional_tool_name_id.barcode_id') + mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型') + diameter = fields.Integer(string='刀具直径(mm)') + knife_tip_r_angle = fields.Float(string='刀尖R角(mm)') + # 其他信息 + install_tool_time = fields.Datetime("刀具组装时间", related='functional_tool_name_id.tool_loading_time') + on_board_time = fields.Datetime('上机装刀时间') + max_lifetime_value = fields.Integer(string='最大寿命值(min)') + alarm_value = fields.Integer(string='报警值(min)') + used_value = fields.Integer(string='已使用值(min)') + functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警'), ('已拆除', '已拆除')], string='状态') + alarm_time = fields.Datetime('报警时间') + dispose_user = fields.Char('处理人') + dispose_time = fields.Char('处理时间') + dispose_func = fields.Char('处理方法/措施', readonly=False) + + active = fields.Boolean(string='已归档', default=True) + + @api.model + def _read_group_machine_table_name_ids(self, categories, domain, order): + machine_table_name_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) + return categories.browse(machine_table_name_ids) + + def create_tool_warning_record(self, obj): + """ + 机台换刀申请报警状态时，创建功能刀具预警记录 + """ + if obj: + for tool in obj.get('tool_changing_apply_id'): + self.env['sf.functional.tool.warning'].create({ + 'production_line_id': tool.production_line_id.id, + 'maintenance_equipment_id': tool.maintenance_equipment_id.id, + 'machine_tool_code': tool.machine_tool_code, + 'machine_table_type_id': tool.machine_table_type_id.id, + 'cutter_spacing_code_id': tool.cutter_spacing_code_id.id, + 'functional_tool_name_id': tool.functional_tool_name_id.id, + 'barcode_id': tool.barcode_id.id, + 'diameter': tool.diameter, + 'knife_tip_r_angle': tool.knife_tip_r_angle, + 'max_lifetime_value': tool.max_lifetime_value, + 'alarm_value': tool.alarm_value, + 'used_value': tool.used_value, + 'functional_tool_status': tool.functional_tool_status, + 'alarm_time': fields.Datetime.now(), + }) + + +class StockMoveLine(models.Model): + _inherit = 'stock.move.line' + _description = '功能刀具出入库记录' + _order = 'date desc' + + functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具组装单') + functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True, + group_expand='_read_group_functional_tool_type_id') + functional_tool_name = fields.Char('刀具名称') + diameter = fields.Integer(string='刀具直径(mm)') + knife_tip_r_angle = fields.Float(string='刀尖R角(mm)') + install_tool_time = fields.Datetime("刀具组装时间", default=fields.Datetime.now()) + code = fields.Char('编码') + rfid = fields.Char('Rfid') + tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组') + + @api.model + def _read_group_functional_tool_type_id(self, categories, domain, order): + names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) + return categories.browse(names) + + +class RealTimeDistributionOfFunctionalTools(models.Model): + _name = 'sf.real.time.distribution.of.functional.tools' + _description = '功能刀具安全库存' + + name = fields.Char('名称', readonly=True, compute='_compute_name', store=True) + functional_name_id = fields.Many2one('sf.tool.inventory', string='功能刀具名称', required=True) + tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=False, required=True) + sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False, + group_expand='_read_mrs_cutting_tool_type_ids', store=True) + diameter = fields.Integer(string='刀具直径(mm)', readonly=False) + knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=False) + 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) + min_stock_num = fields.Integer('最低库存量') + max_stock_num = fields.Integer('最高库存量') + batch_replenishment_num = fields.Integer('批次补货量', readonly=True, compute='_compute_batch_replenishment_num') + unit = fields.Char('单位') + image = fields.Binary('图片', readonly=False) + + coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False) + whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=False) + # 能力特征信息 + 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.Many2one( + 'maintenance.equipment.image', '刀尖特征', + domain=[('type', '=', '刀尖特征')], + related='sf_functional_cutting_tool_entity_ids.blade_tip_characteristics_id') + handle_type_id = fields.Many2one( + 'maintenance.equipment.image', '柄部类型', + domain=[('type', '=', '柄部类型')], related='sf_functional_cutting_tool_entity_ids.handle_type_id') + 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_coolants_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) + + sf_functional_tool_assembly_ids = fields.Many2many('sf.functional.tool.assembly', 'sf_functional_tool_assembly_ref', + '功能刀具组装单', readonly=True) + + active = fields.Boolean(string='已归档', default=True) + + @api.onchange('functional_name_id') + def _onchange_num(self): + for item in self: + if item.functional_name_id: + item.tool_groups_id = item.functional_name_id.tool_groups_id.id + item.sf_cutting_tool_type_id = item.functional_name_id.functional_cutting_tool_model_id.id + item.diameter = item.functional_name_id.diameter + item.knife_tip_r_angle = item.functional_name_id.angle + + @api.depends('functional_name_id') + def _compute_name(self): + for obj in self: + if obj.tool_groups_id: + obj.name = obj.functional_name_id.name + else: + obj.sudo().name = '' + + @api.constrains('min_stock_num', 'max_stock_num') + def _check_stock_num(self): + for obj in self: + if obj.min_stock_num > obj.max_stock_num: + raise ValidationError('【最低安全库存】不能高于【最高安全库存】！！!') + + @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('sf_functional_cutting_tool_entity_ids', 'min_stock_num', 'max_stock_num') + def _compute_batch_replenishment_num(self): + for tool in self: + if tool: + # 判断功能刀具组装单是否已经完成 + tool.sudo().estimate_functional_tool_assembly_ids(tool) + tool.sudo().get_stock_num(tool) + # 计算当前库存量 + tool.sudo().tool_stock_total = tool.tool_stock_num + tool.side_shelf_num + tool.on_tool_stock_num + # 如果当前库存量小于最低库存量，计算批次补货量 + tool.sudo().open_batch_replenishment_num(tool) + + def open_batch_replenishment_num(self, tool): + """ + 计算批次补货量 + """ + if tool.tool_stock_total < tool.min_stock_num: + tool.sudo().batch_replenishment_num = tool.max_stock_num - tool.tool_stock_total + # 根据判断创建功能刀具组装单 + if not tool.sf_functional_tool_assembly_ids and re.match(r'^\d+$', str(tool.id)): + for i in range(tool.batch_replenishment_num): + tool.sudo().create_functional_tool_assembly(tool) + print(i, ": ", tool.sf_functional_tool_assembly_ids) + else: + tool.sudo().batch_replenishment_num = 0 + + def create_functional_tool_assembly(self, tool): + """ + 创建功能刀具组装单 + """ + functional_tool_assembly = tool.env['sf.functional.tool.assembly'].sudo().create({ + 'functional_tool_name': tool.name, + 'functional_tool_type_id': tool.sf_cutting_tool_type_id.id, + 'tool_groups_id': tool.tool_groups_id.id, + 'functional_tool_diameter': tool.diameter, + 'knife_tip_r_angle': tool.knife_tip_r_angle, + 'coarse_middle_thin': tool.coarse_middle_thin, + 'loading_task_source': '2', + 'use_tool_time': fields.Datetime.now() + timedelta(hours=4), + 'applicant': '系统自动', + 'apply_time': fields.Datetime.now(), + 'whether_standard_knife': tool.whether_standard_knife, + 'reason_for_applying': '安全库存', + }) + tool.sudo().sf_functional_tool_assembly_ids = [(4, functional_tool_assembly.id)] + + def estimate_functional_tool_assembly_ids(self, tool): + """ + 判断功能刀具组装单是否完成，如果全部完成清空sf_functional_tool_assembly_ids的数据 + """ + for sf_functional_tool_assembly_id in tool.sf_functional_tool_assembly_ids: + if sf_functional_tool_assembly_id.assemble_status == '0': + return False + tool.sudo().sf_functional_tool_assembly_ids = [] + + def get_stock_num(self, tool): + """ + 计算刀具房数量、线边刀库数量、机内刀库数量 + """ + if tool: + tool.tool_stock_num = 0 + tool.side_shelf_num = 0 + tool.on_tool_stock_num = 0 + if tool.sf_functional_cutting_tool_entity_ids: + for cutting_tool in tool.sf_functional_cutting_tool_entity_ids: + if cutting_tool.tool_room_num > 0: + tool.tool_stock_num += 1 + elif cutting_tool.line_edge_knife_library_num > 0: + tool.side_shelf_num += 1 + elif cutting_tool.machine_knife_library_num > 0: + tool.on_tool_stock_num += 1 + + def create_or_edit_safety_stock(self, vals, sf_functional_cutting_tool_entity_ids): + """ + 根据传入的信息新增或者更新功能刀具安全库存的信息 + """ + # 根据功能刀具名称、刀具组、直径或尖刀R角、粗/中/精查询该功能刀具是否已经存在 + record = self.env['sf.real.time.distribution.of.functional.tools'].search( + [('functional_name_id', '=', vals['functional_name_id']), + ('sf_cutting_tool_type_id', '=', vals['sf_cutting_tool_type_id']), + ('diameter', '=', vals['diameter']), ('knife_tip_r_angle', '=', vals['knife_tip_r_angle']), + ('coarse_middle_thin', '=', vals['coarse_middle_thin']), ('tool_groups_id', '=', vals['tool_groups_id'])]) + 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) + + status_create = fields.Boolean('是否是新增状态', default=True) + + @api.model_create_multi + def create(self, vals_list): + for vals in vals_list: + vals['status_create'] = False + records = super(RealTimeDistributionOfFunctionalTools, self).create(vals_list) + return records diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py index 75fc02e0..bfb8d64b 100644 --- a/sf_tool_management/models/tool_material_search.py +++ b/sf_tool_management/models/tool_material_search.py @@ -20,35 +20,35 @@ class ToolMaterial(models.Model): specification_id = fields.Many2one('sf.tool.materials.basic.parameters', '规格', related='product_id.specification_id') image = fields.Binary('图片', related='product_id.image_1920') - number = fields.Integer('总数量', compute='_compute_number') - usable_num = fields.Integer('可用数量', compute='_compute_number') - have_been_used_num = fields.Integer('在用数量', compute='_compute_number') - scrap_num = fields.Integer('报废数量', compute='_compute_number') + number = fields.Integer('总数量', compute='_compute_number', store=True) + usable_num = fields.Integer('可用数量', compute='_compute_number', store=True) + have_been_used_num = fields.Integer('在用数量', compute='_compute_number', store=True) + scrap_num = fields.Integer('报废数量', compute='_compute_number', store=True) barcode_ids = fields.One2many('stock.lot', 'tool_material_search_id', string='序列号', readonly=True) - @api.depends('barcode_ids') + @api.depends('product_id.stock_quant_ids.quantity') def _compute_number(self): for record in self: usable_num = 0 have_been_used_num = 0 scrap_num = 0 - if record.barcode_ids: - record.number = len(record.barcode_ids) - for barcode_id in record.barcode_ids: - if barcode_id.quant_ids: - if barcode_id.quant_ids[-1].location_id.name == '刀具组装位置': - have_been_used_num = have_been_used_num + 1 - else: - usable_num = usable_num + 1 - record.usable_num = usable_num - record.have_been_used_num = have_been_used_num - record.scrap_num = scrap_num - else: - record.number = 0 - record.usable_num = 0 - record.have_been_used_num = 0 - record.scrap_num = 0 + for quant in record.product_id.stock_quant_ids: + location = quant.location_id.name + if location == '刀具房': + usable_num += quant.quantity + elif location == '刀具组装位置': + have_been_used_num += quant.quantity + elif location == '进货': + pass + elif location != 'Vendors': + scrap_num += quant.quantity + record.usable_num = usable_num + record.have_been_used_num = have_been_used_num + record.scrap_num = scrap_num + record.number = usable_num + have_been_used_num + scrap_num + # 更新数据到cloud的动态数据 + record.enroll_tool_material() @api.model def _read_group_cutting_tool_material_id(self, categories, domain, order): diff --git a/sf_tool_management/views/functional_tool_views.xml b/sf_tool_management/views/functional_tool_views.xml new file mode 100644 index 00000000..82fbd8bc --- /dev/null +++ b/sf_tool_management/views/functional_tool_views.xml @@ -0,0 +1,514 @@ + + + + + + sf.functional.cutting.tool.entity.list.tree + sf.functional.cutting.tool.entity + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sf.functional.cutting.tool.entity.list.form + sf.functional.cutting.tool.entity + +
+
+ + + +
+ +
+ + + +
+
+

+ +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + sf.functional.cutting.tool.entity.list.tree + sf.functional.cutting.tool.entity + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 功能刀具列表 + ir.actions.act_window + sf.functional.cutting.tool.entity + tree,form,search + + + + + + sf.functional.tool.warning.tree + sf.functional.tool.warning + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sf.functional.tool.warning.search + sf.functional.tool.warning + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 功能刀具预警 + ir.actions.act_window + sf.functional.tool.warning + tree,search + + + + + + 功能刀具安全库存 + sf.real.time.distribution.of.functional.tools + + + + + + + + + + + + + + + + + + + + + + + 功能刀具安全库存 + sf.real.time.distribution.of.functional.tools + +
+ + + + + +
+

+ +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + 功能刀具安全库存 + sf.real.time.distribution.of.functional.tools + + + + + + + + + + + + + + + + + + + + + + + + 功能刀具安全库存 + ir.actions.act_window + sf.real.time.distribution.of.functional.tools + tree,form,search + + + + + + + 功能刀具出入库记录 + stock.move.line + + + + + + + + + + + + + + + + + + + + + + + 功能刀具出入库记录 + stock.move.line + + + + + + + + + + + + + + + + + + + + + + + 功能刀具出入库记录 + ir.actions.act_window + stock.move.line + tree,search + + + [('functional_tool_name_id', '!=', False)] + + + + \ No newline at end of file diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 4dd23a4e..46c77b82 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -1,513 +1,6 @@ - - - sf.functional.cutting.tool.entity.list.tree - sf.functional.cutting.tool.entity - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sf.functional.cutting.tool.entity.list.form - sf.functional.cutting.tool.entity - -
-
- - - -
- -
- - - -
-
-

- -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - sf.functional.cutting.tool.entity.list.tree - sf.functional.cutting.tool.entity - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 功能刀具列表 - ir.actions.act_window - sf.functional.cutting.tool.entity - tree,form,search - - - - - - sf.functional.tool.warning.tree - sf.functional.tool.warning - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sf.functional.tool.warning.search - sf.functional.tool.warning - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 功能刀具预警 - ir.actions.act_window - sf.functional.tool.warning - tree,search - - - - - - 功能刀具安全库存 - sf.real.time.distribution.of.functional.tools - - - - - - - - - - - - - - - - - - - - - - - 功能刀具安全库存 - sf.real.time.distribution.of.functional.tools - -
- - - - - -
-

- -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - 功能刀具安全库存 - sf.real.time.distribution.of.functional.tools - - - - - - - - - - - - - - - - - - - - - - - - 功能刀具安全库存 - ir.actions.act_window - sf.real.time.distribution.of.functional.tools - tree,form,search - - - - - - - 功能刀具出入库记录 - stock.move.line - - - - - - - - - - - - - - - - - - - - - - 功能刀具出入库记录 - stock.move.line - - - - - - - - - - - - - - - - - - - - - - - 功能刀具出入库记录 - ir.actions.act_window - stock.move.line - tree,search - - - [('functional_tool_name_id', '!=', False)] - - - 机床换刀申请 @@ -998,7 +491,7 @@ 功能刀具组装 sf.functional.tool.assembly -
+