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_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml index 453de6a3..94fc6b45 100644 --- a/sf_dlm_management/views/product_template_management_view.xml +++ b/sf_dlm_management/views/product_template_management_view.xml @@ -10,6 +10,7 @@ + diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index d530b227..532971ee 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -115,7 +115,7 @@ class Manufacturing_Connect(http.Controller): logging.info('RfidCode:%s' % ret['RfidCode']) if 'RfidCode' in ret: workorder = request.env['mrp.workorder'].sudo().search( - [('routing_type', '=', '装夹预调'), ('rfid_code', '=', ret['RfidCode'])]) + [('routing_type', '=', '装夹预调'), ('rfid_code', '=', ret['RfidCode'])], limit=1, order='id asc') if workorder: for item in workorder: if item.material_center_point: @@ -123,8 +123,8 @@ class Manufacturing_Connect(http.Controller): res['Datas'].append({ 'XOffset': 0 if not item.material_center_point else offset[0], 'YOffset': 0 if not item.material_center_point else offset[1], - 'ZOffet': 0 if not item.material_center_point else offset[2], - 'COffset': 0 if not item.X_deviation_angle else item.X_deviation_angle, + 'ZOffset': 0 if not item.material_center_point else offset[2], + 'COffset': 0, 'Coordinate': 'G54' }) else: diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index 7c389c2d..8a39696d 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -57,6 +57,8 @@ class MrpProduction(models.Model): production_line_state = fields.Selection([('待上产线', '待上产线'), ('已上产线', '已上产线'), ('已下产线', '已下产线')], string='上/下产线', default='待上产线') + manual_quotation = fields.Boolean('人工编程', default=False, readonly=True) + @api.depends( 'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state', 'workorder_ids.state', 'product_qty', 'qty_producing', 'schedule_state') @@ -132,6 +134,14 @@ class MrpProduction(models.Model): # cnc程序获取 def fetchCNC(self): cnc = self.env['mrp.production'].search([('id', '=', self.id)]) + quick_order = self.env['quick.easy.order'].search([('id', '=', cnc.product_id.id)]) + programme_way = False + if cnc.manual_quotation is True: + programme_way = 'manual operation' + else: + programme_way = 'auto' + if quick_order: + programme_way = 'manual operation' try: res = {'model_code': '' if not cnc.product_id.model_code else cnc.product_id.model_code, 'production_no': cnc.name, @@ -146,8 +156,9 @@ class MrpProduction(models.Model): 'embryo_height': cnc.product_id.bom_ids.bom_line_ids.product_id.height, 'embryo_width': cnc.product_id.bom_ids.bom_line_ids.product_id.width, 'order_no': cnc.origin, - 'model_order_no': '-'.join(cnc.product_id.default_code.split('-')[:4]), + 'model_order_no': cnc.product_id.default_code, 'user': cnc.env.user.name, + 'programme_way': programme_way, 'model_file': '' if not cnc.product_id.model_file else base64.b64encode( cnc.product_id.model_file).decode('utf-8') } diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 6afcd589..3954b6d2 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -46,6 +46,8 @@ class ResMrpWorkOrder(models.Model): ], string="工序类型") results = fields.Char('结果') + manual_quotation = fields.Boolean('人工编程', default=False, readonly=True) + @api.onchange('users_ids') def get_user_permissions(self): uid = self.env.uid @@ -364,6 +366,7 @@ class ResMrpWorkOrder(models.Model): y7 = self.Y7_axis y8 = self.Y8_axis z1 = self.Z9_axis + z2 = self.Z10_axis x0 = ((x3 - x4) * (x2 * y1 - x1 * y2) - (x1 - x2) * (x4 * y3 - x3 * y4)) / ( (x3 - x4) * (y1 - y2) - (x1 - x2) * (y3 - y4)) y0 = ((y3 - y4) * (y2 * x1 - y1 * x2) - (y1 - y2) * (y4 * x3 - y3 * x4)) / ( @@ -374,7 +377,7 @@ class ResMrpWorkOrder(models.Model): (y7 - y8) * (x5 - x6) - (y5 - y6) * (x7 - x8)) x = (x0 + x1) / 2 y = (y0 + y1) / 2 - z = z1 / 2 + z = (z1 + z2) / 2 jd = math.atan2((x5 - x6), (y5 - y6)) jdz = jd * 180 / math.pi @@ -815,7 +818,7 @@ class ResMrpWorkOrder(models.Model): production_no_ftp = reportpath.split('/') production_no = workorder.production_id.name.replace('/', '_') # ftp地址 - remotepath = os.path.join('/NC/', production_no_ftp[1], 'detection') + remotepath = os.path.join('/NC', production_no_ftp[1], 'detection') logging.info('ftp地址:%s' % remotepath) if reportpath.find(production_no) != -1: # 服务器内临时地址 @@ -894,7 +897,7 @@ class CNCprocessing(models.Model): 'cutting_tool_handle_type': obj['cutting_tool_handle_type'], 'estimated_processing_time': obj['estimated_processing_time'], 'remark': obj['remark'], - 'program_path': program_path.replace('/tmp', '') + 'program_path': program_path.replace('/tmp', '/home/ftp/ftp_root/NC') }) cnc_processing.get_cnc_processing_file(program_path_tmp, cnc_processing, program_path) # cnc_workorder.state = 'done' @@ -933,7 +936,7 @@ class CNCprocessing(models.Model): # 将FTP的nc文件下载到临时目录 def download_file_tmp(self, production_no, processing_panel): - remotepath = os.path.join('/NC/', production_no, 'return', processing_panel) + remotepath = os.path.join('/NC', production_no, 'return', processing_panel) serverdir = os.pat.join('/tmp', production_no, 'return', processing_panel) ftp_resconfig = self.env['res.config.settings'].get_values() ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp_resconfig['ftp_user'], @@ -986,15 +989,16 @@ class SfWorkOrderBarcodes(models.Model): workorder = self.env['mrp.workorder'].browse(self.ids) # workorder = self.env['mrp.workorder'].search( # [('routing_type', '=', '装夹预调'), ('production_id', '=', self.production_id.id)]) - # workorder_old = self.env['mrp.workorder'].search([('rfid_code', '=', barcode)]) - # if workorder_old: - # raise UserError('该托盘已绑定工件，请先解除绑定！！！') + workorder_old = self.env['mrp.workorder'].search([('rfid_code', '=', barcode)]) + if workorder_old: + 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)]) + logging.info("托盘信息：%s" % lots) if lots: for lot in lots: if lot.product_id.categ_type == '夹具': @@ -1013,6 +1017,7 @@ class SfWorkOrderBarcodes(models.Model): if workorder_rfid: for item in workorder_rfid: item.write({'rfid_code': barcode}) + logging.info("Rfid绑定成功！！！") else: embryo_stock_lot = self.env['stock.lot'].search([('name', '=', barcode)]) if embryo_stock_lot: diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index d81b41b9..0bb27fcb 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -10,7 +10,6 @@ from odoo.modules import get_resource_path # from OCC.Extend.DataExchange import write_stl_file - class ResProductMo(models.Model): _inherit = 'product.template' @@ -522,6 +521,9 @@ class ResProductMo(models.Model): string='注册状态', default='未注册') industry_code = fields.Char('行业编码', readonly=True) + # bfm下单 + manual_quotation = fields.Boolean('人工编程', default=False, readonly=True) + @api.constrains('tool_length') def _check_tool_length_size(self): if self.tool_length > 1000000: @@ -616,6 +618,7 @@ class ResProductMo(models.Model): 'process_parameters_code') else self.get_process_parameters_id(item['process_parameters_code']), 'model_remark': item['remark'], 'default_code': '%s-%s' % (order_number, i), + 'manual_quotation': item['manual_quotation'] or False, 'active': True, } copy_product_id.sudo().write(vals) 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 1eece8d2..3ae8bed0 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_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index d7dda081..2795047a 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -591,6 +591,7 @@ class MachineBrand(models.Model): if not brand: self.create({ "name": item['name'], + "active": item['active'], "code": item['code'], "remark": item['remark'], "image_brand": '' if not item['image_brand'] else base64.b64decode(item['image_brand']), @@ -599,6 +600,7 @@ class MachineBrand(models.Model): }) else: brand.name = item['name'] + brand.active = item['active'] brand.remark = item['remark'] brand.image_brand = '' if not item['image_brand'] else base64.b64decode(item['image_brand']) brand.tag_ids = self.env['sf.machine.brand.tags'].search( diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py index ed52d9de..1ece6b86 100644 --- a/sf_sale/models/quick_easy_order.py +++ b/sf_sale/models/quick_easy_order.py @@ -8,8 +8,8 @@ from datetime import datetime import requests from odoo import http from odoo.http import request -# from OCC.Extend.DataExchange import read_step_file -# from OCC.Extend.DataExchange import write_stl_file +from OCC.Extend.DataExchange import read_step_file +from OCC.Extend.DataExchange import write_stl_file from odoo import models, fields, api from odoo.modules import get_resource_path from odoo.exceptions import ValidationError, UserError diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py index 651e1ea8..b740871f 100644 --- a/sf_sale/models/quick_easy_order_old.py +++ b/sf_sale/models/quick_easy_order_old.py @@ -2,19 +2,14 @@ import logging import base64 import hashlib import os -import platform -import json from datetime import datetime -import requests -from odoo import http -from odoo.http import request -# from OCC.Extend.DataExchange import read_step_file -# from OCC.Extend.DataExchange import write_stl_file +from stl import mesh +# from OCC.Core.GProp import GProp_GProps +from OCC.Extend.DataExchange import read_step_file +from OCC.Extend.DataExchange import write_stl_file from odoo import models, fields, api from odoo.modules import get_resource_path from odoo.exceptions import ValidationError, UserError -from odoo.addons.sf_base.commons.common import Common -from . import parser_and_calculate_work_time as pc class QuickEasyOrder(models.Model): @@ -36,7 +31,7 @@ class QuickEasyOrder(models.Model): ('0.02', '±0.02mm'), ('0.01', '±0.01mm')], string='加工精度', default='0.10') material_id = fields.Many2one('sf.production.materials', '材料') - material_model_id = fields.Many2one('sf.materials.model', '型号') + material_model_id = fields.Many2one('sf.materials.model', '型号', domain="[('materials_id', '=', material_id)]") # process_id = fields.Many2one('sf.production.process', string='表面工艺') parameter_ids = fields.Many2many('sf.production.process.parameter', 'process_item_order_rel', string='可选参数') quantity = fields.Integer('数量', default=1) @@ -83,9 +78,7 @@ class QuickEasyOrder(models.Model): model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest() report_path = attachment._full_path(attachment.store_fname) vals['model_file'] = self.transition_glb_file(report_path, model_code) - logging.info('create-model_file:%s' % len(vals['model_file'])) obj = super(QuickEasyOrder, self).create(vals) - self.model_coloring(obj) logging.info('---------开始派单到工厂-------') self.distribute_to_factory(obj) obj.state = '待接单' @@ -122,15 +115,42 @@ class QuickEasyOrder(models.Model): base64_data = base64.b64encode(file_attachment_id.datas) base64_datas = base64_data.decode('utf-8') model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest() - logging.info("模型编码: %s" % model_code) - item.model_file = self.transition_glb_file(report_path, model_code) + # 读取文件 + shapes = read_step_file(report_path) + # # 第一种获取体积方式 + # props = GProp_GProps() + # # brepgprop_VolumeProperties(shapes, props) + # volume = props.Mass() + # # print(volume) + # item.model_volume = volume + # # 长宽高/体积 + # output_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(library_of_models.code) + '.stl') + output_file = os.path.join('/tmp', str(model_code) + '.stl') + your_mesh = mesh.Mesh.from_file(output_file) + volume, cog, inertia = your_mesh.get_mass_properties() + xyz = (your_mesh.max_ - your_mesh.min_) + item.model_length = xyz[0] # 长 单位mm + item.model_width = xyz[1] # 宽 + item.model_height = xyz[2] # 高 + item.model_volume = volume + write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) + # 转化为glb + # output_glb_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(library_of_models.code) + '.glb') + output_glb_file = os.path.join('/tmp', str(model_code) + '.glb') + util_path = get_resource_path('sf_base', 'static/util') + cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file) + os.system(cmd) + # 转base64 + with open(output_glb_file, 'rb') as fileObj: + image_data = fileObj.read() + base64_data = base64.b64encode(image_data) + item.model_file = base64_data else: + item.model_length = False + item.model_width = False + item.model_height = False + item.model_volume = False item.model_file = False - item.model_feature = False - item.model_length = 0 - item.model_width = 0 - item.model_height = 0 - item.model_volume = 0 def distribute_to_factory(self, obj): """ @@ -201,7 +221,7 @@ class QuickEasyOrder(models.Model): self_machining_bom = self.env['mrp.bom'].bom_create(self_machining_embryo, 'normal', False) # 创建坯料里bom的组件 self_machining_bom_line = self_machining_bom.bom_create_line(self_machining_embryo) - if self_machining_bom_line is False: + if not self_machining_bom_line: self.cr.rollback() return UserError('该订单模型的材料型号在您分配的工厂里暂未有原材料,请先配置再进行分配') # 产品配置bom @@ -212,12 +232,16 @@ class QuickEasyOrder(models.Model): outsource_embryo = self.env['product.template'].sudo().no_bom_product_create(outsource_id, item, order_id, 'subcontract', i) + if outsource_embryo == -3: + self.cr.rollback() + return UserError( + '该订单模型的材料型号在您分配的工厂里暂未设置获取方式和供应商,请先配置再进行分配') # 创建坯料的bom outsource_bom = self.env['mrp.bom'].bom_create(outsource_embryo, 'subcontract', True) # 创建坯料的bom的组件 outsource_bom_line = outsource_bom.with_user( self.env.ref("base.user_admin")).bom_create_line(outsource_embryo) - if outsource_bom_line is False: + if not outsource_bom_line: self.cr.rollback() return UserError('该订单模型的材料型号在您分配的工厂里暂未有原材料,请先配置再进行分配') # 产品配置bom @@ -227,6 +251,10 @@ class QuickEasyOrder(models.Model): purchase_embryo = self.env['product.template'].sudo().no_bom_product_create(purchase_id, item, order_id, 'purchase', i) + if purchase_embryo == -3: + self.cr.rollback() + return UserError( + '该订单模型的材料型号在您分配的工厂里暂未设置获取方式和供应商,请先配置再进行分配') # 产品配置bom product_bom_purchase = self.env['mrp.bom'].bom_create(product, 'normal', False) product_bom_purchase.bom_create_line_has(purchase_embryo) @@ -234,93 +262,3 @@ class QuickEasyOrder(models.Model): except Exception as e: # self.cr.rollback() return UserError('工厂创建销售订单和产品失败，请联系管理员') - - # 特征识别 - def feature_recognition(self, report_path, model_code): - feature_path = self.env['sf.auto_quatotion.common'].sudo().get_feature_full_path() - process_time_db_path = self.env['sf.auto_quatotion.common'].sudo().get_process_time_db_path() - ret = self.env['sf.auto_quatotion.common'].sudo().get_auto_quatotion(report_path, feature_path, - process_time_db_path, - model_code) - return ret - - # 模型上色 - def model_coloring(self, order): - url = '/api/library_of_models/create' - config = self.env['res.config.settings'].get_values() - config_header = Common.get_headers(self, config['token'], config['sf_secret_key']) - logging.info('order: %s' % order.name) - if order: - attachment = order.upload_model_file[0] - base64_data = base64.b64encode(attachment.datas) - base64_datas = base64_data.decode('utf-8') - model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest() - logging.info('model_file-size: %s' % len(order.model_file)) - logging.info('attachment.datas-size: %s' % len(attachment.datas)) - vals = { - 'model_code': model_code, - 'model_data': base64_data, - 'model_name': attachment.name, - 'model_long': order.model_length, - 'model_width': order.model_width, - 'model_height': order.model_height, - 'model_volume': order.model_volume, - 'model_order_no': order.name, - 'remark': '订单号:%s 客户:%s' % (order.name, order.customer_id.name) - } - try: - ret = requests.post((config['sf_url'] + url), json={}, data=vals, headers=config_header, - timeout=60) - ret = ret.json() - # result = json.loads(ret['result']) - if ret['status'] == 1: - order.model_color_state = 'success' - else: - order.model_color_state = 'fail' - raise UserError(ret['message']) - except Exception as e: - order.model_color_state = 'fail' - raise UserError("模型上色失败") - - # 自动报价 - def _get_price(self, order): - url = '/api/automatic_quotes' - config = self.env['res.config.settings'].sudo().get_values() - config_header = Common.get_headers(self, config['token'], config['sf_secret_key']) - logging.info("报价接口..........% s" % order.name) - try: - if order: - vals = {} - # mrs合作伙伴token - vals['token'] = config['token'] - vals['accuracy'] = order.machining_precision - vals['number'] = order.quantity - vals['process_code'] = 0 - vals['texture_code'] = order.material_model_id.materials_no - vals['delivery_days'] = 15 - if order.model_file: - for item in order.upload_model_file: - if item.ids[0]: - logging.info('create-attachment:%s' % int(item.ids[0])) - attachment = self.env['ir.attachment'].sudo().search([('id', '=', int(item.ids[0]))]) - vals['attachment_id'] = attachment.id - else: - vals['attachment_id'] = '' - vals['feature_infos'] = order.model_feature - vals['model_long'] = order.model_length - vals['model_width'] = order.model_width - vals['model_height'] = order.model_height - logging.info('vals:%s' % vals) - ret = requests.post((config['sf_url'] + url), json={}, data=vals, headers=config_header) - result = json.dumps(json.loads(ret.text), ensure_ascii=False, indent=4, separators=(',', ':')) - logging.info('报价接口返回:%s' % result) - price_result = json.loads(result) - # random.randint(0, 10000) - order.write({'price': price_result.get('price')}) - else: - raise UserError("订单不存在") - except Exception as e: - if ret['status'] != 1: - raise UserError(e) - else: - raise UserError("自动报价失败，请联系管理员") diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index e2313ba3..379ff199 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -142,6 +142,12 @@ class ResaleOrderLine(models.Model): check_status = fields.Selection(related='order_id.check_status') +class ProductTemplate(models.Model): + _inherit = 'product.template' + + manual_quotation = fields.Boolean('人工编程', default=False) + + class RePurchaseOrder(models.Model): _inherit = 'purchase.order' @@ -206,6 +212,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_sale/security/ir.model.access.csv b/sf_sale/security/ir.model.access.csv index 451396e3..290829df 100644 --- a/sf_sale/security/ir.model.access.csv +++ b/sf_sale/security/ir.model.access.csv @@ -1,7 +1,7 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_quick_easy_order,quick_easy_order,model_quick_easy_order,base.group_system,1,1,1,0 -access_quick_easy_order_group_sale_salemanager,quick_easy_order_group_sale_salemanager,model_quick_easy_order,sf_base.group_sale_salemanager,1,1,1,0 -access_quick_easy_order_group_sale_director,quick_easy_order_group_sale_director,model_quick_easy_order,sf_base.group_sale_director,1,1,1,0 +access_quick_easy_order_group_sale_salemanager,quick_easy_order_group_sale_salemanager,model_quick_easy_order,sf_base.group_sale_salemanager,1,0,1,0 +access_quick_easy_order_group_sale_director,quick_easy_order_group_sale_director,model_quick_easy_order,sf_base.group_sale_director,1,0,1,0 access_sf_auto_quatotion_common,sf_auto_quatotion_common,model_sf_auto_quatotion_common,base.group_system,1,1,1,1 access_sale_order_manager,sale_order_manager,model_sale_order,sf_base.group_sale_salemanager,1,1,1,0 access_sale_order_director,sale_order_director,model_sale_order,sf_base.group_sale_director,1,1,1,0 diff --git a/sf_sale/views/quick_easy_order_view.xml b/sf_sale/views/quick_easy_order_view.xml index 3300fc27..abc574b0 100644 --- a/sf_sale/views/quick_easy_order_view.xml +++ b/sf_sale/views/quick_easy_order_view.xml @@ -47,17 +47,8 @@ - - - - - - - - - - - + @@ -75,8 +66,18 @@ - + + + + + + + + + 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..01c3de46 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -1,477 +1,10 @@ # -*- coding: utf-8 -*- -import re -import json -import requests +import logging + 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): @@ -660,7 +193,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model): machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', domain="[('production_line_id', '=', production_line_id)]") machine_table_name = fields.Char(string='机台号', readonly=True, related='machine_table_name_id.name') - cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', required=True, + cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', domain="[('equipment_id', '=', machine_table_name_id)]") whether_standard_knife = fields.Boolean(string='是否标准刀', default=True) need_knife_time = fields.Datetime(string='用刀时间', readonly=False) @@ -670,19 +203,20 @@ class CAMWorkOrderProgramKnifePlan(models.Model): barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', domain=[('product_id.name', '=', '功能刀具')]) - functional_tool_name = fields.Char(string='功能刀具名称', compute='_compute_functional_tool_name') - functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False) - tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组') - diameter = fields.Integer(string='刀具直径(mm)', readonly=False) - tool_included_angle = fields.Float(string='刀尖R角(mm)', readonly=False) - tool_loading_length = fields.Float(string='总长度(mm)', readonly=False) + functional_tool_name = fields.Char(string='功能刀具名称', readonly=True) + functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', + compute='_compute_tool_number', store=True) + tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', compute='_compute_tool_number', store=True) + diameter = fields.Integer(string='刀具直径(mm)', compute='_compute_tool_number', store=True) + tool_included_angle = fields.Float(string='刀尖R角(mm)', compute='_compute_tool_number', store=True) + tool_loading_length = fields.Float(string='总长度(mm)', compute='_compute_tool_number', store=True) extension_length = fields.Float(string='伸出长(mm)') effective_length = fields.Float(string='有效长(mm)') new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=False, default='0') coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], default='3', string='粗/中/精', readonly=False) L_D = fields.Float(string='L/D值', readonly=False) - clearance_length = fields.Float(string='避空长(mm)', readonly=False) + clearance_length = fields.Float(string='避空长(mm)', compute='_compute_tool_number', store=True) required_cutting_time = fields.Integer(string='需切削时长', readonly=False) process_type = fields.Char('加工类型') margin_x_y = fields.Float('余量_X/Y') @@ -698,15 +232,24 @@ class CAMWorkOrderProgramKnifePlan(models.Model): active = fields.Boolean(string='已归档', default=True) - @api.depends('diameter', 'tool_included_angle', 'tool_groups_id') - def _compute_functional_tool_name(self): - for obj in self: - if obj.tool_groups_id: - obj.functional_tool_name = '%s-D%sR%s' % ( - obj.tool_groups_id.name, obj.diameter, - obj.tool_included_angle) + @api.depends('functional_tool_name') + def _compute_tool_number(self): + for item in self: + inventory = self.env['sf.tool.inventory'].sudo().search([('name', '=', item.functional_tool_name)]) + if inventory: + item.functional_tool_type_id = inventory.functional_cutting_tool_model_id.id + item.tool_groups_id = inventory.tool_groups_id.id + item.diameter = int(inventory.diameter) + item.tool_included_angle = inventory.angle + item.tool_loading_length = inventory.tool_length + item.clearance_length = inventory.blade_length else: - obj.functional_tool_name = None + item.functional_tool_type_id = False + item.tool_groups_id = False + item.diameter = 0 + item.tool_included_angle = 0 + item.tool_loading_length = 0 + item.clearance_length = 0 @api.model def _read_group_names(self, categories, domain, order): @@ -780,10 +323,9 @@ class CAMWorkOrderProgramKnifePlan(models.Model): 根据传入的工单信息，查询是否有需要的功能刀具，如果没有则生成CAM工单程序用刀计划 """ status = False - if cnc_processing.functional_tool_type_id and cnc_processing.cutting_tool_name: + if cnc_processing.cutting_tool_name: functional_tools = self.env['sf.real.time.distribution.of.functional.tools'].sudo().search( - [('sf_cutting_tool_type_id', '=', cnc_processing.functional_tool_type_id.id), - ('name', '=', cnc_processing.cutting_tool_name)]) + [('name', '=', cnc_processing.cutting_tool_name)]) if functional_tools: for functional_tool in functional_tools: if functional_tool.on_tool_stock_num == 0: @@ -796,7 +338,6 @@ class CAMWorkOrderProgramKnifePlan(models.Model): 'name': cnc_processing.workorder_id.production_id.name, 'cam_procedure_code': cnc_processing.program_name, 'filename': cnc_processing.cnc_id.name, - 'functional_tool_type_id': cnc_processing.functional_tool_type_id.id, 'functional_tool_name': cnc_processing.cutting_tool_name, 'cam_cutter_spacing_code': cnc_processing.cutting_tool_no, 'process_type': cnc_processing.processing_type, @@ -807,8 +348,11 @@ class CAMWorkOrderProgramKnifePlan(models.Model): 'shank_model': cnc_processing.cutting_tool_handle_type, 'estimated_processing_time': cnc_processing.estimated_processing_time, }) + logging.info('CAM工单程序用刀计划创建成功！！！') # 创建装刀请求 knife_plan.apply_for_tooling() + else: + logging.info('功能刀具【%s】满足CNC用刀需求！！！') class FunctionalToolAssembly(models.Model): @@ -819,12 +363,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 +408,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/mrp_workorder.py b/sf_tool_management/models/mrp_workorder.py index df9a341e..8098c5a1 100644 --- a/sf_tool_management/models/mrp_workorder.py +++ b/sf_tool_management/models/mrp_workorder.py @@ -36,6 +36,7 @@ class CNCprocessing(models.Model): obj = super(CNCprocessing, self).create(vals) # 调用CAM工单程序用刀计划创建方法 self.env['sf.cam.work.order.program.knife.plan'].create_cam_work_plan(obj) + logging.info('成功调用CAM工单程序用刀计划创建方法！！！') return obj 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 -
+
@@ -23,12 +24,21 @@ - - - - - - + + + - - - - - + + + + + @@ -163,20 +185,20 @@ shelf.location.kanban sf.shelf.location - +
- +
- +
@@ -187,31 +209,31 @@
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -225,7 +247,7 @@
diff --git a/sf_warehouse/wizard/__init__.py b/sf_warehouse/wizard/__init__.py new file mode 100644 index 00000000..20a7f5c4 --- /dev/null +++ b/sf_warehouse/wizard/__init__.py @@ -0,0 +1 @@ +from . import wizard \ No newline at end of file diff --git a/sf_warehouse/wizard/wizard.py b/sf_warehouse/wizard/wizard.py new file mode 100644 index 00000000..7961819b --- /dev/null +++ b/sf_warehouse/wizard/wizard.py @@ -0,0 +1,64 @@ +from odoo import fields, models, api +from odoo.exceptions import UserError, ValidationError + + +class ShelfLocationWizard(models.TransientModel): + _name = 'sf.shelf.location.wizard' + _description = '货位变更' + + name = fields.Char('') + + current_location_id = fields.Many2one('stock.location', string='所属库区', readonly=True) + + current_shelf_id = fields.Many2one('sf.shelf', string='当前货架', readonly=True) + current_barcode = fields.Char('当前货位编码', readonly=True) + current_name = fields.Char('当前货位名称', readonly=True) + current_product_id = fields.Many2one('product.product', string='产品', readonly=True) + + destination_shelf_id = fields.Many2one('sf.shelf', string='目标货架', compute='_compute_destination_name') + destination_barcode_id = fields.Many2one('sf.shelf.location', string='目标货位编码', required=True, + domain="") + destination_name = fields.Char('目标货位名称', compute='_compute_destination_name') + + def return_domain(self): + val = [('location_status', '=', '空闲')] + if self.current_product_id: + val = ['|', ('location_status', '=', '空闲'), ('product_id', '=', self.current_product_id)] + if self.destination_shelf_id: + val.append(('shelf_id', '=', self.destination_shelf_id)) + return "%s" % val + + @api.depends('destination_barcode_id') + def _compute_destination_name(self): + if self.destination_barcode_id: + self.destination_name = self.destination_barcode_id.name + self.destination_shelf_id = self.destination_barcode_id.shelf_id.id + else: + self.destination_name = '' + self.destination_shelf_id = False + + # + # @api.onchange('destination_barcode_id') + # def _onchange_destination_shelf_id(self): + # if self.destination_barcode_id: + # self.destination_shelf_id = self.destination_barcode_id.shelf_id.id + + def confirm_the_change(self): + shelf_location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', self.current_barcode)]) + # 变更货位 + if self.destination_barcode_id and shelf_location: + if self.destination_barcode_id.product_id and self.destination_barcode_id.product_id == shelf_location.current_product_id and not self.destination_barcode_id.product_sn_id: + self.destination_barcode_id.product_num += shelf_location.product_num + else: + self.destination_barcode_id.product_sn_id = shelf_location.product_sn_id.id + self.destination_barcode_id.product_id = shelf_location.product_id.id + self.destination_barcode_id.product_num = shelf_location.product_num + + shelf_location.product_sn_id = False + shelf_location.product_id = False + shelf_location.product_num = 0 + else: + raise ValidationError('目标货位出错，请联系管理员！') + + # 关闭弹出窗口 + return {'type': 'ir.actions.act_window_close'} diff --git a/sf_warehouse/wizard/wizard_view.xml b/sf_warehouse/wizard/wizard_view.xml new file mode 100644 index 00000000..1bb95e15 --- /dev/null +++ b/sf_warehouse/wizard/wizard_view.xml @@ -0,0 +1,49 @@ + + + + 货位变更 + sf.shelf.location.wizard + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + 货位变更 + ir.actions.act_window + sf.shelf.location.wizard + form + + new + + \ No newline at end of file