diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index b70cc749..e199a938 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -503,4 +503,22 @@ div:has(.o_required_modifier) > label::before { color: #fff; background-color: #4A4F59; border-color: #4A4F59; +} + +// 功能刀具组装单 弹窗样式 +.o_horizontal_separator.mt-4.mb-3.text-uppercase.fw-bolder.small ~ div.col-lg-6 .o_inner_group.col-lg-6 { + width: 100%; +} +.o_horizontal_separator.mt-4.mb-3.text-uppercase.fw-bolder.small ~ div .o_inner_group .o_wrap_field.d-flex.d-sm-contents.flex-column{ + display: flex!important; + flex-direction: row!important; + input { + border-bottom: 1px solid; + } +} + +// 设置表格横向滚动 +.o_list_renderer.o_renderer { + max-width: 100%; + overflow-x: auto; } \ No newline at end of file diff --git a/sf_base/static/src/scss/format_img.scss b/sf_base/static/src/scss/format_img.scss index 279c5fff..982d3c50 100644 --- a/sf_base/static/src/scss/format_img.scss +++ b/sf_base/static/src/scss/format_img.scss @@ -1,7 +1,7 @@ .o_data_row .w-100 { width: 40px !important; height: 40px !important; - display: block !important; + //display: block !important; } .o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector):not(.o_handle_cell):not(.o_list_button):not(.o_list_record_remove) { diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index 34e00aee..6ae825c2 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -5,7 +5,7 @@ import re import requests from itertools import groupby from odoo import api, fields, models, _ -from odoo.exceptions import UserError,ValidationError +from odoo.exceptions import UserError, ValidationError from odoo.addons.sf_base.commons.common import Common from odoo.tools import float_compare, float_round, float_is_zero, format_datetime @@ -315,7 +315,7 @@ class MrpProduction(models.Model): production.fetchCNC(', '.join(product_id_to_production_names[production.product_id.id])) else: production.write({'programming_no': production_programming.programming_no, - 'programming_state': '编程中'}) + 'programming_state': '已编程' if production_programming.programming_state == '已编程' else '编程中'}) # # 根据加工面板的面数及对应的工序模板生成工单 i = 0 processing_panel_len = len(production.product_id.model_processing_panel.split(',')) @@ -379,6 +379,12 @@ class MrpProduction(models.Model): workorders_values.append( self.env['mrp.workorder'].json_workorder_str('', production, route)) production.workorder_ids = workorders_values + if production_programming.programming_state == '已编程': + logging.info("production_programming: %s" % production_programming.name) + production.workorder_ids.filtered(lambda t: t.routing_type == 'CNC加工').write({ + 'cnc_ids': production_programming.workorder_ids.filtered( + lambda + t1: t1.routing_type == 'CNC加工').cnc_ids}) for workorder in production.workorder_ids: workorder.duration_expected = workorder._get_duration_expected() @@ -406,20 +412,15 @@ class MrpProduction(models.Model): # 工单排序 def _reset_work_order_sequence1(self, k): - sequen = 0 for rec in self: - current_sequence = 10 + cnc_workorder = rec.workorder_ids.filtered(lambda wo: wo.name == "CNC加工") + cnc_back_workorder = rec.workorder_ids.filtered(lambda wo: wo.name == "CNC加工(返工)") for work in rec.workorder_ids: - work.sequence = current_sequence - current_sequence += 10 - if work.name == '后置三元质量检测' and work.processing_panel == k: - sequen = work.sequence - - for work in rec.workorder_ids: - if work.name == '后置三元质量检测(返工)' and work.processing_panel == k: - work.sequence = sequen + 2 - if work.name == 'CNC加工(返工)' and work.processing_panel == k: - work.sequence = sequen + 1 + if work.name == cnc_workorder.name and work.processing_panel == k: + cnc_back_workorder.write({'sequence': work.sequence + 1}) + print(cnc_back_workorder.sequence) + elif work.routing_type not in ['装夹预调'] and work != cnc_back_workorder: + work.sequence += 1 # 在制造订单上新增工单 def _create_workorder1(self, k): @@ -459,13 +460,7 @@ class MrpProduction(models.Model): order='sequence asc' ) i += 1 - for route in routingworkcenter: - - # if route.routing_type == '后置三元质量检测': - # workorders_values.append( - # self.env['mrp.workorder'].json_workorder_str1(k, production, route) - # ) if route.routing_type == 'CNC加工': workorders_values.append( self.env['mrp.workorder'].json_workorder_str1(k, production, route)) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index d8e6fe02..07c5e44a 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -677,13 +677,59 @@ class ResMrpWorkOrder(models.Model): productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company( self.production_id.company_id).create( values) - self.env['stock.move'].sudo().create(productions._get_moves_raw_values()) + # self.env['stock.move'].sudo().create(productions._get_moves_raw_values()) self.env['stock.move'].sudo().create(productions._get_moves_finished_values()) productions._create_workorder() productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \ ( p.move_dest_ids.procure_method != 'make_to_order' and not p.move_raw_ids and not p.workorder_ids)).action_confirm() + for production_item in productions: + process_parameter_workorder = self.env['mrp.workorder'].search( + [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production_item.id), + ('is_subcontract', '=', True)]) + if process_parameter_workorder: + is_pick = False + consecutive_workorders = [] + m = 0 + sorted_workorders = sorted(process_parameter_workorder, key=lambda w: w.id) + for i in range(len(sorted_workorders) - 1): + if m == 0: + is_pick = False + if sorted_workorders[i].supplier_id.id == sorted_workorders[i + 1].supplier_id.id and \ + sorted_workorders[i].is_subcontract == sorted_workorders[i + 1].is_subcontract and \ + sorted_workorders[i].id == sorted_workorders[i + 1].id - 1: + if sorted_workorders[i] not in consecutive_workorders: + consecutive_workorders.append(sorted_workorders[i]) + consecutive_workorders.append(sorted_workorders[i + 1]) + m += 1 + continue + else: + if m == len(consecutive_workorders) - 1 and m != 0: + self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, + production_item) + if sorted_workorders[i] in consecutive_workorders: + is_pick = True + consecutive_workorders = [] + m = 0 + # 当前面的连续工序生成对应的外协出入库单再生成当前工序的外协出入库单 + if is_pick is False: + self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i], + production_item) + if m == len(consecutive_workorders) - 1 and m != 0: + self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, + production_item) + if sorted_workorders[i] in consecutive_workorders: + is_pick = True + consecutive_workorders = [] + m = 0 + if m == len(consecutive_workorders) - 1 and m != 0: + self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production_item) + if is_pick is False and m == 0: + if len(sorted_workorders) == 1: + self.env['stock.picking'].create_outcontract_picking(sorted_workorders, production_item) + else: + self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i], production_item) for production in productions: origin_production = production.move_dest_ids and production.move_dest_ids[ @@ -704,6 +750,28 @@ class ResMrpWorkOrder(models.Model): 'mail.message_origin_link', values={'self': production, 'origin': origin_production}, subtype_id=self.env.ref('mail.mt_note').id) + + ''' + 创建生产计划 + ''' + # 工单耗时 + workorder_duration = 0 + for workorder in productions.workorder_ids: + workorder_duration += workorder.duration_expected + + sale_order = self.env['sale.order'].sudo().search([('name', '=', productions.origin)]) + if sale_order: + # sale_order.write({'schedule_status': 'to schedule'}) + self.env['sf.production.plan'].sudo().with_company(self.production_id.company_id).create({ + 'name': productions.name, + 'order_deadline': sale_order.deadline_of_delivery, + 'production_id': productions.id, + 'date_planned_start': productions.date_planned_start, + 'origin': productions.origin, + 'product_qty': productions.product_qty, + 'product_id': productions.product_id.id, + 'state': 'draft', + }) if self.test_results == '返工': productions = self.production_id # self.env['stock.move'].sudo().create(productions._get_moves_raw_values()) @@ -720,7 +788,6 @@ class ResMrpWorkOrder(models.Model): 'name': '%s(返工)' % route.route_workcenter_id.name, 'processing_panel': k, 'routing_type': route.routing_type, - 'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起', 'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids, route.routing_type, production.product_id), @@ -728,10 +795,38 @@ class ResMrpWorkOrder(models.Model): 'date_planned_finished': datetime.now() + timedelta(days=1), 'duration_expected': 60, 'duration': 0, - + 'manual_quotation': production.workorder_ids.filtered( + lambda t: t.routing_type == 'CNC加工').manual_quotation, + 'rfid_code': production.workorder_ids.filtered(lambda t: t.routing_type == 'CNC加工').rfid_code, + 'cnc_ids': production.workorder_ids.filtered(lambda t: t.routing_type == 'CNC加工').cnc_ids, + 'cmm_ids': production.workorder_ids.filtered(lambda t: t.routing_type == 'CNC加工').cmm_ids, }] return workorders_values_str + @api.depends('production_availability', 'blocked_by_workorder_ids', 'blocked_by_workorder_ids.state') + def _compute_state(self): + super(ResMrpWorkOrder, self)._compute_state() + for item in self: + scrap_workorder = self.env['mrp.workorder'].search( + [('production_id', '=', item.production_id.id), ('routing_type', '=', 'CNC加工'), + ('state', '=', 'done'), ('is_remanufacture', '=', True)]) + print(item.name) + print(item.state) + if item.name == 'CNC加工(返工)' and item.state not in ['ready', 'progress', 'done']: + item.state = 'ready' + if item.routing_type == '解除装夹': + last_workorder = self.env['mrp.workorder'].search( + [('production_id', '=', item.production_id.id), ('name', '=', 'CNC加工(返工)'), + ('state', '!=', 'done')]) + if item.state != 'pending': + if last_workorder: + item.state = 'pending' + if scrap_workorder: + item.state = 'cancel' + elif item.routing_type == '表面工艺': + if scrap_workorder: + item.state = 'cancel' + # 重写工单开始按钮方法 def button_start(self): if self.routing_type == '装夹预调': @@ -895,6 +990,8 @@ class ResMrpWorkOrder(models.Model): record.write({ 'date_planned_finished': tem_date_planned_finished # 保持原值 }) + if record.routing_type == 'CNC加工' and record.test_results in ['返工', '报废']: + record.recreateManufacturingOrWorkerOrder() is_production_id = True for workorder in record.production_id.workorder_ids: if workorder.state != 'done': diff --git a/sf_manufacturing/views/agv_setting_views.xml b/sf_manufacturing/views/agv_setting_views.xml index 42662e2c..9a4bf25e 100644 --- a/sf_manufacturing/views/agv_setting_views.xml +++ b/sf_manufacturing/views/agv_setting_views.xml @@ -36,7 +36,7 @@ - + diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index bc1d4bfe..a34dc4cf 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -80,7 +80,7 @@ tree,form - + current [('state', '!=', 'cancel'),('schedule_state', '=', '已排')] @@ -477,7 +477,7 @@ - + @@ -618,7 +618,6 @@ - diff --git a/sf_mrs_connect/models/ftp_operate.py b/sf_mrs_connect/models/ftp_operate.py index 3a09a305..8b547bb3 100644 --- a/sf_mrs_connect/models/ftp_operate.py +++ b/sf_mrs_connect/models/ftp_operate.py @@ -32,6 +32,9 @@ class FtpController(): logging.error(f"Error checking file: {e}") return False + + + # # 检测字符串的编码 # def detect_encoding(self, s): # result = chardet.detect(s) diff --git a/sf_tool_management/controllers/controllers.py b/sf_tool_management/controllers/controllers.py index d7f2adee..400dd60f 100644 --- a/sf_tool_management/controllers/controllers.py +++ b/sf_tool_management/controllers/controllers.py @@ -67,3 +67,34 @@ class Manufacturing_Connect(http.Controller): res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} logging.info('get_functional_tool_entity_Info error:%s' % e) return json.JSONEncoder().encode(res) + + @http.route('/AutoDeviceApi/PutToolParameter', type='http', auth='none', methods=['GET', 'POST'], csrf=False, + cors="*") + def put_tool_preset_parameter_port(self, **kw): + """ + 刀具预调仪接口 + :param kw: + :return: + """ + logging.info('put_tool_preset_parameter_port:%s' % kw) + res = {'Succeed': True, 'Datas': []} + try: + datas = request.httprequest.data + ret = str(datas, 'utf-8') + data_lists = ret.split(",") + data_list = [data.replace('+', '') for data in data_lists] + logging.info(data_list) + tool_assembly = request.env['sf.functional.tool.assembly'].sudo().search( + [('assembly_order_code', '=', data_list[0]), ('start_preset_bool', '=', True)]) + if not tool_assembly: + return json.JSONEncoder().encode( + {'Succeed': False, 'ErrorCode': 201, 'code': data_list[0], 'Error': '没有找到正在组装的组装单！'}) + tool_assembly.write({ + 'after_assembly_tool_loading_length': float(data_list[1] or "0"), # 高度(总长度) + 'after_assembly_functional_tool_diameter': float(data_list[2] or "0"), # 直径 + 'after_assembly_knife_tip_r_angle': float(data_list[3] or "0") # R角 + }) + except Exception as e: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} + logging.info('put_tool_preset_parameter_port error:%s' % e) + return json.JSONEncoder().encode(res) diff --git a/sf_tool_management/data/tool_data.xml b/sf_tool_management/data/tool_data.xml index 282f8c2a..4df37127 100644 --- a/sf_tool_management/data/tool_data.xml +++ b/sf_tool_management/data/tool_data.xml @@ -5,8 +5,8 @@ code model._cron_tool_datasync_all() - 1 - days + 12 + hours -1 \ No newline at end of file diff --git a/sf_tool_management/models/__init__.py b/sf_tool_management/models/__init__.py index b589e095..b6020280 100644 --- a/sf_tool_management/models/__init__.py +++ b/sf_tool_management/models/__init__.py @@ -6,4 +6,5 @@ from . import mrp_workorder from . import functional_tool_enroll from . import fixture_material_search from . import fixture_enroll +from . import temporary_data_processing_methods diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 4a440df6..e840224f 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -538,12 +538,13 @@ class FunctionalToolAssembly(models.Model): chuck_name = fields.Char('') # ============================================== # 组装功能刀具参数信息 + start_preset_bool = fields.Boolean('开始预调', default=False) barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True) after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='组装后功能刀具类型', readonly=True) - after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', readonly=True) - after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', readonly=True) + after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', readonly=True, digits=(10, 3)) + after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', readonly=True, digits=(10, 3)) after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', readonly=True) cut_time = fields.Integer(string='已切削时间(min)', readonly=True) cut_length = fields.Float(string='已切削长度(mm)', readonly=True) @@ -555,8 +556,9 @@ class FunctionalToolAssembly(models.Model): after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', readonly=True) after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)', readonly=True) after_assembly_used_value = fields.Integer(string='组装后已使用值(min)', readonly=True) - after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', readonly=True) - after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True) + after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', readonly=True, digits=(10, 3)) + after_assembly_handle_length = fields.Float(string='组装后刀柄长度(mm)',readonly=True, digits=(10, 3)) + after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True, digits=(10, 3)) after_assembly_effective_length = fields.Float(string='组装后有效长(mm)', readonly=True) L_D_number = fields.Float(string='L/D值(mm)', readonly=True) hiding_length = fields.Float(string='避空长(mm)', readonly=True) @@ -574,29 +576,64 @@ class FunctionalToolAssembly(models.Model): active = fields.Boolean(string='已归档', default=True) + def put_start_preset(self): + self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False}) + self.write({ + 'after_assembly_tool_loading_length': 0, + 'after_assembly_functional_tool_diameter': 0, + 'after_assembly_knife_tip_r_angle': 0, + 'start_preset_bool': True + }) + return { + 'type': 'ir.actions.act_window', + 'res_model': 'sf.functional.tool.assembly.order', + 'name': '功能刀具组装单', + 'view_mode': 'form', + 'target': 'new', + 'context': {'default_name': self.name, + 'default_assembly_order_code': self.assembly_order_code, + 'default_production_line_name_id': self.production_line_name_id.id, + 'default_machine_tool_name_id': self.machine_tool_name_id.id, + 'default_cutter_spacing_code_id': self.cutter_spacing_code_id.id, + 'default_functional_tool_name': self.functional_tool_name, + 'default_functional_tool_type_id': self.functional_tool_type_id.id, + 'default_tool_groups_id': self.tool_groups_id.id, + 'default_functional_tool_diameter': self.functional_tool_diameter, + 'default_knife_tip_r_angle': self.knife_tip_r_angle, + 'default_tool_loading_length': self.tool_loading_length, + 'default_functional_tool_length': self.functional_tool_length, + 'default_effective_length': self.effective_length, + 'default_whether_standard_knife': self.whether_standard_knife, + 'default_coarse_middle_thin': self.coarse_middle_thin, + 'default_new_former': self.new_former, + 'default_use_tool_time': self.use_tool_time, + 'default_reason_for_applying': self.reason_for_applying + } + } + def _get_code(self, loading_task_source): """ 自动生成组装单编码 """ new_time = str(fields.Date.today()) - datetime = new_time[2:4] + new_time[5:7] + new_time[-2:] + datetime = new_time[2:4] + new_time[5:7] + if loading_task_source == '0': + code = 'C' + datetime + elif loading_task_source == '1': + code = 'J' + datetime + elif loading_task_source == '2': + code = 'K' + datetime + else: + code = False functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().search( [('loading_task_source', '=', loading_task_source), - ('assembly_order_code', 'ilike', datetime)], limit=1, order="id desc") + ('assembly_order_code', 'ilike', code)], limit=1, order="id desc") if not functional_tool_assembly: num = "%03d" % 1 else: m = int(functional_tool_assembly.assembly_order_code[-3:]) + 1 num = "%03d" % m - if loading_task_source == '0': - code = 'CAMZZD' + datetime + str(num) - elif loading_task_source == '1': - code = 'JTZZD' + datetime + str(num) - elif loading_task_source == '2': - code = 'MTSZZD' + datetime + str(num) - else: - code = False - return code + return code + str(num) def get_functional_tool(self, val): functional_tools = self.env['sf.functional.tool.assembly'].search( diff --git a/sf_tool_management/models/fixture_enroll.py b/sf_tool_management/models/fixture_enroll.py index 24e4e9f5..f4d2a8cd 100644 --- a/sf_tool_management/models/fixture_enroll.py +++ b/sf_tool_management/models/fixture_enroll.py @@ -1,6 +1,7 @@ import json import base64 import requests +import logging from odoo import models, api from odoo.addons.sf_base.commons.common import Common from odoo.exceptions import UserError @@ -10,30 +11,36 @@ class StockLot(models.Model): _inherit = 'stock.lot' _description = '夹具物料序列号注册' - def enroll_fixture_material_stock(self): + def sync_enroll_fixture_material_stock_all(self): + logging.info("调用 sync_enroll_fixture_material_stock_all 同步接口") 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(self, token, sf_secret_key) str_url = sf_sync_config['sf_url'] + "/api/fixture_material_stock/create" - objs_all = self.env['stock.lot'].search([('id', '=', self.id)]) + product_ids = self.env['product.product'].sudo().search([('categ_type', '=', '夹具')]).ids + objs_all = self.env['stock.lot'].search([('rfid', '!=', False), ('product_id', 'in', product_ids)]) fixture_material_stock_list = [] - if objs_all: - for item in objs_all: - val = { - 'name': item.name, - 'tool_material_status': item.tool_material_status, - 'location': [] if not item.quant_ids else item.quant_ids[-1].location_id.name, - 'fixture_material_search_id': item.fixture_material_search_id.id, - } - fixture_material_stock_list.append(val) - kw = json.dumps(fixture_material_stock_list, ensure_ascii=False) - r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) - ret = r.json() - if ret.get('code') == 200: - return '夹具物料序列号注册成功' - else: - raise UserError("没有注册夹具物料序列号信息") + try: + if objs_all: + for item in objs_all: + val = { + 'name': item.name, + 'tool_material_status': item.tool_material_status, + 'location': [] if not item.quant_ids else item.quant_ids[-1].location_id.name, + 'fixture_material_search_id': item.fixture_material_search_id.id, + } + fixture_material_stock_list.append(val) + kw = json.dumps(fixture_material_stock_list, ensure_ascii=False) + r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) + ret = r.json() + if ret.get('code') == 200: + logging.info("夹具物料序列号每日同步成功") + return '夹具物料序列号注册成功' + else: + logging.info("没有注册夹具物料序列号信息") + except Exception as e: + logging.info("夹具物料序列号同步失败:%s" % e) class FixtureMaterialSearch(models.Model): @@ -42,41 +49,46 @@ class FixtureMaterialSearch(models.Model): crea_url = "/api/fixture_material/create" - def enroll_fixture_material(self): + def sync_enroll_fixture_material_all(self): + logging.info("调用 sync_enroll_fixture_material_all 同步接口") 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(self, token, sf_secret_key) str_url = sf_sync_config['sf_url'] + self.crea_url - objs_all = self.search([('id', '=', self.id)]) + objs_all = self.search([]) fixture_material_list = [] - if objs_all: - for obj in objs_all: - val = { - 'name': obj.name, - 'id': obj.id, - 'fixture_material_code': obj.fixture_material_id.code, - 'fixture_model_code': obj.fixture_model_id.code, - 'specification_name': obj.specification_fixture_id.name, - 'image': '' if not obj.image else base64.b64encode(obj.image).decode('utf-8'), - 'number': obj.number, - 'usable_num': obj.usable_num, - 'have_been_used_num': obj.have_been_used_num, - 'scrap_num': obj.scrap_num - } - fixture_material_list.append(val) - kw = json.dumps(fixture_material_list, ensure_ascii=False) - r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) - ret = r.json() - if ret.get('code') == 200: - return '夹具物料注册成功' - else: - raise UserError("没有注册夹具物料信息") + try: + if objs_all: + for obj in objs_all: + val = { + 'name': obj.name, + 'id': obj.id, + 'fixture_material_code': obj.fixture_material_id.code, + 'fixture_model_code': obj.fixture_model_id.code, + 'specification_name': obj.specification_fixture_id.name, + 'image': '' if not obj.image else base64.b64encode(obj.image).decode('utf-8'), + 'number': obj.number, + 'usable_num': obj.usable_num, + 'have_been_used_num': obj.have_been_used_num, + 'scrap_num': obj.scrap_num + } + fixture_material_list.append(val) + kw = json.dumps(fixture_material_list, ensure_ascii=False) + r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) + ret = r.json() + if ret.get('code') == 200: + logging.info("夹具物料每日同步成功") + return '夹具物料注册成功' + else: + logging.info("没有注册夹具物料信息") + except Exception as e: + logging.info("夹具物料同步失败:%s" % e) - @api.model_create_multi - def create(self, vals_list): - records = super(FixtureMaterialSearch, self).create(vals_list) - for record in records: - if record: - record.enroll_fixture_material() - return records + # @api.model_create_multi + # def create(self, vals_list): + # records = super(FixtureMaterialSearch, self).create(vals_list) + # for record in records: + # if record: + # record.enroll_fixture_material() + # return records diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py index 52565174..6f7e14bb 100644 --- a/sf_tool_management/models/functional_tool.py +++ b/sf_tool_management/models/functional_tool.py @@ -25,12 +25,13 @@ class FunctionalCuttingToolEntity(models.Model): 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.Float(string='刀具直径(mm)', readonly=True) - knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True) + functional_tool_diameter = fields.Float(string='刀具直径(mm)', readonly=True, digits=(10, 3)) + knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True, digits=(10, 3)) 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) + tool_loading_length = fields.Float(string='总长度(mm)', readonly=True, digits=(10, 3)) + handle_length = fields.Float(string='刀柄长度(mm)',readonly=True, digits=(10, 3)) + functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True, digits=(10, 3)) 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) @@ -51,13 +52,6 @@ class FunctionalCuttingToolEntity(models.Model): safe_inventory_id = fields.Many2one('sf.real.time.distribution.of.functional.tools', string='功能刀具安全库存', readonly=True) - def button_safe_inventory_id(self): - """更新功能刀具关联的安全库存记录""" - tool_is = self.search([]) - for item in tool_is: - item.safe_inventory_id = self.env['sf.real.time.distribution.of.functional.tools'].search( - [('functional_name_id', '=', item.tool_name_id.id)])[0] - @api.depends('barcode_id.quant_ids', 'functional_tool_status') def _compute_current_location_id(self): for record in self: diff --git a/sf_tool_management/models/functional_tool_enroll.py b/sf_tool_management/models/functional_tool_enroll.py index 0d076ddf..8891b287 100644 --- a/sf_tool_management/models/functional_tool_enroll.py +++ b/sf_tool_management/models/functional_tool_enroll.py @@ -33,23 +33,26 @@ def get_suitable_coolant_names(item): class ToolDatasync(models.Model): _name = 'sf.tool.datasync' - _description = '定时同步所有刀具' + _description = '定时同步所有刀具、夹具' def _cron_tool_datasync_all(self): try: self.env['stock.lot'].sudo().sync_enroll_tool_material_stock_all() - logging.info("刀具物料序列号每日同步成功") + + self.env['stock.lot'].sudo().sync_enroll_fixture_material_stock_all() + self.env['sf.tool.material.search'].sudo().sync_enroll_tool_material_all() - logging.info("刀具物料每日同步成功") + + self.env['sf.fixture.material.search'].sudo().sync_enroll_fixture_material_all() + self.env['sf.functional.cutting.tool.entity'].sudo().esync_enroll_functional_tool_entity_all() - logging.info("功能刀具列表每日同步成功") - self.env['sf.functional.tool.warning'].sudo().sync_enroll_functional_tool_warning_all() - logging.info("功能刀具预警每日同步成功") - self.env['stock.move.line'].sudo().sync_enroll_functional_tool_move_all() - logging.info("功能刀具出入库记录每日同步成功") - self.env[ - 'sf.real.time.distribution.of.functional.tools'].sudo().sync_enroll_functional_tool_real_time_distribution_all() - logging.info("功能刀具安全库存每日同步成功") + logging.info("已全部同步完成！！！") + # self.env['sf.functional.tool.warning'].sudo().sync_enroll_functional_tool_warning_all() + # logging.info("功能刀具预警每日同步成功") + # self.env['stock.move.line'].sudo().sync_enroll_functional_tool_move_all() + # logging.info("功能刀具出入库记录每日同步成功") + # self.env['sf.real.time.distribution.of.functional.tools'].sudo().sync_enroll_functional_tool_real_time_distribution_all() + # logging.info("功能刀具安全库存每日同步成功") except Exception as e: logging.info("捕获错误信息:%s" % e) raise ValidationError("数据错误导致同步失败,请联系管理员") @@ -59,24 +62,25 @@ class StockLot(models.Model): _inherit = 'stock.lot' _description = '刀具物料序列号注册' - def enroll_tool_material_stock(self): - logging.info('调用刀具物料序列号注册接口: enroll_tool_material_stock()') - 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(self, token, sf_secret_key) - str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create" - objs_all = self.env['stock.lot'].search([('id', '=', self.id), ('active', 'in', [True, False])]) - self._get_sync_stock_lot(objs_all, str_url, token, headers) + # def enroll_tool_material_stock(self): + # logging.info('调用刀具物料序列号注册接口: enroll_tool_material_stock()') + # 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(self, token, sf_secret_key) + # str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create" + # objs_all = self.env['stock.lot'].search([('id', '=', self.id), ('active', 'in', [True, False])]) + # self._get_sync_stock_lot(objs_all, str_url, token, headers) def sync_enroll_tool_material_stock_all(self): - logging.info('调用刀具物料序列号注册接口: sync_enroll_tool_material_stock_all()') + logging.info('调用 sync_enroll_tool_material_stock_all 同步接口') 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(self, token, sf_secret_key) str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create" - objs_all = self.env['stock.lot'].search([('rfid', '!=', False)]) + product_ids = self.env['product.product'].sudo().search([('categ_type', '=', '刀具')]).ids + objs_all = self.env['stock.lot'].search([('rfid', '!=', False), ('product_id', 'in', product_ids)]) self._get_sync_stock_lot(objs_all, str_url, token, headers) def _get_sync_stock_lot(self, objs_all, str_url, token, headers): @@ -95,11 +99,12 @@ class StockLot(models.Model): r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) ret = r.json() if ret.get('code') == 200: - return '刀具物料序列号注册成功' + logging.info("刀具物料序列号每日同步成功") + return '刀具(夹具)物料序列号注册成功' else: - logging.info("没有注册刀具物料序列号信息") + logging.info("没有刀具物料序列号信息") except Exception as e: - logging.info("捕获错误信息:%s" % e) + logging.info("刀具物料序列号同步失败:%s" % e) class ToolMaterial(models.Model): @@ -108,18 +113,18 @@ class ToolMaterial(models.Model): crea_url = '/api/tool_material/create' - def enroll_tool_material(self): - logging.info('调用刀具物料注册接口: enroll_tool_material()') - 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(self, token, sf_secret_key) - str_url = sf_sync_config['sf_url'] + self.crea_url - objs_all = self.search([('id', '=', self.id)]) - self._get_sync_tool_material_search(objs_all, str_url, token, headers) + # def enroll_tool_material(self): + # logging.info('调用刀具物料注册接口: enroll_tool_material()') + # 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(self, token, sf_secret_key) + # str_url = sf_sync_config['sf_url'] + self.crea_url + # objs_all = self.search([('id', '=', self.id)]) + # self._get_sync_tool_material_search(objs_all, str_url, token, headers) def sync_enroll_tool_material_all(self): - logging.info('调用刀具物料注册接口: sync_enroll_tool_material_all()') + logging.info('调用 sync_enroll_tool_material_all 同步接口') sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token'] sf_secret_key = sf_sync_config['sf_secret_key'] @@ -150,19 +155,20 @@ class ToolMaterial(models.Model): r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) ret = r.json() if ret.get('code') == 200: + logging.info("刀具物料每日同步成功") return '刀具物料注册成功' else: logging.info('没有注册刀具物料信息') except Exception as e: - logging.info("捕获错误信息:%s" % e) + logging.info("刀具物料同步失败:%s" % e) - @api.model_create_multi - def create(self, vals_list): - records = super(ToolMaterial, self).create(vals_list) - for record in records: - if record: - record.enroll_tool_material() - return records + # @api.model_create_multi + # def create(self, vals_list): + # records = super(ToolMaterial, self).create(vals_list) + # for record in records: + # if record: + # record.enroll_tool_material() + # return records class FunctionalCuttingToolEntity(models.Model): @@ -172,18 +178,18 @@ class FunctionalCuttingToolEntity(models.Model): crea_url = "/api/functional_tool_entity/create" # 注册同步功能刀具列表 - def enroll_functional_tool_entity(self): - logging.info('调用功能刀具列表注册接口: enroll_functional_tool_entity()') - 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(self, token, sf_secret_key) - str_url = sf_sync_config['sf_url'] + self.crea_url - objs_all = self.env['sf.functional.cutting.tool.entity'].search([('id', '=', self.id)]) - self._get_sync_functional_cutting_tool_entity(objs_all, str_url, token, headers) + # def enroll_functional_tool_entity(self): + # logging.info('调用功能刀具列表注册接口: enroll_functional_tool_entity()') + # 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(self, token, sf_secret_key) + # str_url = sf_sync_config['sf_url'] + self.crea_url + # objs_all = self.env['sf.functional.cutting.tool.entity'].search([('id', '=', self.id)]) + # self._get_sync_functional_cutting_tool_entity(objs_all, str_url, token, headers) def esync_enroll_functional_tool_entity_all(self): - logging.info('调用功能刀具列表注册接口: esync_enroll_functional_tool_entity_all()') + logging.info('调用 esync_enroll_functional_tool_entity_all 同步接口') sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token'] sf_secret_key = sf_sync_config['sf_secret_key'] @@ -210,6 +216,7 @@ class FunctionalCuttingToolEntity(models.Model): 'coarse_middle_thin': item.coarse_middle_thin, 'new_former': item.new_former, 'tool_loading_length': item.tool_loading_length, + 'handle_length': item.handle_length, 'functional_tool_length': item.functional_tool_length, 'effective_length': item.effective_length, 'max_lifetime_value': item.max_lifetime_value, @@ -242,256 +249,257 @@ class FunctionalCuttingToolEntity(models.Model): r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) ret = r.json() if ret.get('code') == 200: + logging.info("功能刀具列表每日同步成功") return "功能刀具注册成功" else: logging.info('没有注册功能刀具信息') except Exception as e: - logging.info("捕获错误信息:%s" % e) + logging.info("功能刀具同步失败:%s" % e) - @api.model_create_multi - def create(self, vals_list): - records = super(FunctionalCuttingToolEntity, self).create(vals_list) - for record in records: - if record: - record.enroll_functional_tool_entity() - return records + # @api.model_create_multi + # def create(self, vals_list): + # records = super(FunctionalCuttingToolEntity, self).create(vals_list) + # for record in records: + # if record: + # record.enroll_functional_tool_entity() + # return records - def write(self, vals): - res = super().write(vals) - if vals.get('current_location'): - self.enroll_functional_tool_entity() - return res + # def write(self, vals): + # res = super().write(vals) + # if vals.get('current_location'): + # self.enroll_functional_tool_entity() + # return res - -class FunctionalToolWarning(models.Model): - _inherit = 'sf.functional.tool.warning' - _description = '功能刀具预警注册' - - crea_url = "/api/functional_tool_warning/create" - - # 注册同步功能刀具预警 - def enroll_functional_tool_warning(self): - logging.info('调用功能刀具预警注册接口: enroll_functional_tool_warning()') - 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(self, token, sf_secret_key) - str_url = sf_sync_config['sf_url'] + self.crea_url - objs_all = self.env['sf.functional.tool.warning'].search([('id', '=', self.id)]) - self.get_sync_functional_tool_warning(objs_all, str_url, token, headers) - - def sync_enroll_functional_tool_warning_all(self): - logging.info('调用功能刀具预警注册接口: sync_enroll_functional_tool_warning_all()') - 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(self, token, sf_secret_key) - str_url = sf_sync_config['sf_url'] + self.crea_url - objs_all = self.env['sf.functional.tool.warning'].search([]) - self.get_sync_functional_tool_warning(objs_all, str_url, token, headers) - - def get_sync_functional_tool_warning(self, objs_all, str_url, token, headers): - tool_warning_list = [] - try: - if objs_all: - for item in objs_all: - val = { - 'id': item.id, - 'name': item.name, - 'code': item.code, - 'rfid': item.rfid, - 'tool_groups_name': item.tool_groups_id.name, - 'production_line': item.production_line_id.name, - 'machine_tool_id': item.maintenance_equipment_id.code, - 'machine_tool_code': item.machine_tool_code, - 'cutter_spacing_code': item.cutter_spacing_code_id.code, - 'functional_tool_name': item.name, - 'barcode': item.barcode_id.name, - 'mrs_cutting_tool_type_code': item.mrs_cutting_tool_type_id.code, - 'diameter': item.diameter, - 'knife_tip_r_angle': item.knife_tip_r_angle, - 'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'), - 'on_board_time': item.on_board_time.strftime('%Y-%m-%d %H:%M:%S'), - 'max_lifetime_value': item.max_lifetime_value, - 'alarm_value': item.alarm_value, - 'used_value': item.used_value, - 'functional_tool_status': item.functional_tool_status, - 'alarm_time': item.alarm_time.strftime('%Y-%m-%d %H:%M:%S'), - 'dispose_user': item.dispose_user, - 'dispose_time': item.dispose_time, - 'dispose_func': item.dispose_func, - } - tool_warning_list.append(val) - kw = json.dumps(tool_warning_list, ensure_ascii=False) - r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) - ret = r.json() - if ret.get('code') == 200: - return "功能刀具预警注册成功" - else: - logging.info('没有注册功能刀具预警信息') - except Exception as e: - logging.info("捕获错误信息:%s" % e) - - @api.model_create_multi - def create(self, vals_list): - records = super(FunctionalToolWarning, self).create(vals_list) - for record in records: - if record: - record.enroll_functional_tool_warning() - return records - - -class StockMoveLine(models.Model): - _inherit = 'stock.move.line' - _description = '功能刀具出入库记录注册' - - crea_url = "/api/functional_tool_move/create" - - # 注册同步功能刀具出入库记录 - def enroll_functional_tool_move(self): - logging.info('调用功能刀具出入库记录注册接口: enroll_functional_tool_move()') - 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(self, token, sf_secret_key) - str_url = sf_sync_config['sf_url'] + self.crea_url - objs_all = self.env['stock.move.line'].search([('id', '=', self.id), ('functional_tool_name_id', '!=', False)]) - self.get_sync_stock_move_line(objs_all, str_url, token, headers) - - def sync_enroll_functional_tool_move_all(self): - logging.info('调用功能刀具出入库记录注册接口: sync_enroll_functional_tool_move_all()') - 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(self, token, sf_secret_key) - str_url = sf_sync_config['sf_url'] + self.crea_url - objs_all = self.env['stock.move.line'].search([('functional_tool_name_id', '!=', False)]) - self.get_sync_stock_move_line(objs_all, str_url, token, headers) - - def get_sync_stock_move_line(self, objs_all, str_url, token, headers): - tool_stock_list = [] - try: - if objs_all: - for item in objs_all: - val = { - 'id': item.id, - 'name': item.functional_tool_name, - 'code': item.code, - 'rfid': item.rfid, - 'tool_groups_name': item.tool_groups_id.name, - 'reference': item.reference, - 'barcode': item.lot_id.name, - 'functional_tool_type_code': item.functional_tool_type_id.code, - 'diameter': item.diameter, - 'knife_tip_r_angle': item.knife_tip_r_angle, - 'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'), - 'location_id': item.location_id.name, - 'location_dest_name': item.location_dest_id.name, - 'date': item.date.strftime('%Y-%m-%d %H:%M:%S'), - 'qty_done': item.qty_done, - } - tool_stock_list.append(val) - kw = json.dumps(tool_stock_list, ensure_ascii=False) - r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) - ret = r.json() - if ret.get('code') == 200: - return "功能刀具出入库记录注册成功" - else: - logging.info('没有注册功能刀具出入库记录信息') - except Exception as e: - logging.info("捕获错误信息:%s" % e) - - @api.model_create_multi - def create(self, vals_list): - records = super(StockMoveLine, self).create(vals_list) - for record in records: - if record.functional_tool_name_id: - record.enroll_functional_tool_move() - return records - - -class RealTimeDistributionFunctionalTools(models.Model): - _inherit = 'sf.real.time.distribution.of.functional.tools' - _description = '功能刀具安全库存注册' - - crea_url = "/api/functional_tool_distribution/create" - - # 注册同步功能刀具预警 - def enroll_functional_tool_real_time_distribution(self): - logging.info('调用功能刀具安全库存注册接口: enroll_functional_tool_real_time_distribution()') - 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(self, token, sf_secret_key) - str_url = sf_sync_config['sf_url'] + self.crea_url - objs_all = self.env['sf.real.time.distribution.of.functional.tools'].search([('id', '=', self.id)]) - self.get_sync_real_time_distribution_functional_tools(objs_all, str_url, token, headers) - - def sync_enroll_functional_tool_real_time_distribution_all(self): - logging.info('调用功能刀具安全库存注册接口: sync_enroll_functional_tool_real_time_distribution_all()') - 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(self, token, sf_secret_key) - str_url = sf_sync_config['sf_url'] + self.crea_url - objs_all = self.env['sf.real.time.distribution.of.functional.tools'].search([]) - self.get_sync_real_time_distribution_functional_tools(objs_all, str_url, token, headers) - - def get_sync_real_time_distribution_functional_tools(self, objs_all, str_url, token, headers): - tool_distribution_list = [] - try: - if objs_all: - for item in objs_all: - functional_tool_codes = [] - for obj in item.sf_functional_tool_entity_ids: - functional_tool_codes.append(obj.code) - val = { - 'id': item.id, - 'name': item.name, - 'tool_groups_name': item.tool_groups_id.name, - 'cutting_tool_type_code': item.sf_cutting_tool_type_id.code, - 'diameter': item.diameter, - 'knife_tip_r_angle': item.knife_tip_r_angle, - 'tool_stock_num': item.tool_stock_num, - 'side_shelf_num': item.side_shelf_num, - 'on_tool_stock_num': item.on_tool_stock_num, - 'tool_stock_total': item.tool_stock_total, - 'min_stock_num': item.min_stock_num, - 'max_stock_num': item.max_stock_num, - 'batch_replenishment_num': item.batch_replenishment_num, - 'unit': item.unit, - 'image': '' if not item.image else base64.b64encode(item.image).decode('utf-8'), - 'functional_tool_codes': str(functional_tool_codes), - 'coarse_middle_thin': item.coarse_middle_thin, - 'whether_standard_knife': item.whether_standard_knife, - 'suitable_machining_method_names': get_suitable_machining_method_names(item), - 'blade_tip_characteristics_name': item.blade_tip_characteristics_id.name, - 'handle_type_name': item.handle_type_id.name, - 'cutting_direction_names': get_cutting_direction_names(item), - 'suitable_coolant_names': get_suitable_coolant_names(item), - 'active': item.active - } - tool_distribution_list.append(val) - kw = json.dumps(tool_distribution_list, ensure_ascii=False) - r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) - ret = r.json() - if ret.get('code') == 200: - return "功能刀具出入库记录注册成功" - else: - logging.info('没有注册功能刀具出入库记录信息') - except Exception as e: - logging.info("捕获错误信息:%s" % e) - - @api.model_create_multi - def create(self, vals_list): - records = super(RealTimeDistributionFunctionalTools, self).create(vals_list) - for record in records: - if record: - record.enroll_functional_tool_real_time_distribution() - return records - - def write(self, vals): - res = super().write(vals) - if vals.get('sf_functional_tool_entity_ids') or vals.get('min_stock_num') or vals.get('max_stock_num'): - self.enroll_functional_tool_real_time_distribution() - return res +# +# class FunctionalToolWarning(models.Model): +# _inherit = 'sf.functional.tool.warning' +# _description = '功能刀具预警注册' +# +# crea_url = "/api/functional_tool_warning/create" +# +# # 注册同步功能刀具预警 +# def enroll_functional_tool_warning(self): +# logging.info('调用功能刀具预警注册接口: enroll_functional_tool_warning()') +# 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(self, token, sf_secret_key) +# str_url = sf_sync_config['sf_url'] + self.crea_url +# objs_all = self.env['sf.functional.tool.warning'].search([('id', '=', self.id)]) +# self.get_sync_functional_tool_warning(objs_all, str_url, token, headers) +# +# def sync_enroll_functional_tool_warning_all(self): +# logging.info('调用功能刀具预警注册接口: sync_enroll_functional_tool_warning_all()') +# 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(self, token, sf_secret_key) +# str_url = sf_sync_config['sf_url'] + self.crea_url +# objs_all = self.env['sf.functional.tool.warning'].search([]) +# self.get_sync_functional_tool_warning(objs_all, str_url, token, headers) +# +# def get_sync_functional_tool_warning(self, objs_all, str_url, token, headers): +# tool_warning_list = [] +# try: +# if objs_all: +# for item in objs_all: +# val = { +# 'id': item.id, +# 'name': item.name, +# 'code': item.code, +# 'rfid': item.rfid, +# 'tool_groups_name': item.tool_groups_id.name, +# 'production_line': item.production_line_id.name, +# 'machine_tool_id': item.maintenance_equipment_id.code, +# 'machine_tool_code': item.machine_tool_code, +# 'cutter_spacing_code': item.cutter_spacing_code_id.code, +# 'functional_tool_name': item.name, +# 'barcode': item.barcode_id.name, +# 'mrs_cutting_tool_type_code': item.mrs_cutting_tool_type_id.code, +# 'diameter': item.diameter, +# 'knife_tip_r_angle': item.knife_tip_r_angle, +# 'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'), +# 'on_board_time': item.on_board_time.strftime('%Y-%m-%d %H:%M:%S'), +# 'max_lifetime_value': item.max_lifetime_value, +# 'alarm_value': item.alarm_value, +# 'used_value': item.used_value, +# 'functional_tool_status': item.functional_tool_status, +# 'alarm_time': item.alarm_time.strftime('%Y-%m-%d %H:%M:%S'), +# 'dispose_user': item.dispose_user, +# 'dispose_time': item.dispose_time, +# 'dispose_func': item.dispose_func, +# } +# tool_warning_list.append(val) +# kw = json.dumps(tool_warning_list, ensure_ascii=False) +# r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) +# ret = r.json() +# if ret.get('code') == 200: +# return "功能刀具预警注册成功" +# else: +# logging.info('没有注册功能刀具预警信息') +# except Exception as e: +# logging.info("捕获错误信息:%s" % e) +# +# @api.model_create_multi +# def create(self, vals_list): +# records = super(FunctionalToolWarning, self).create(vals_list) +# for record in records: +# if record: +# record.enroll_functional_tool_warning() +# return records +# +# +# class StockMoveLine(models.Model): +# _inherit = 'stock.move.line' +# _description = '功能刀具出入库记录注册' +# +# crea_url = "/api/functional_tool_move/create" +# +# # 注册同步功能刀具出入库记录 +# def enroll_functional_tool_move(self): +# logging.info('调用功能刀具出入库记录注册接口: enroll_functional_tool_move()') +# 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(self, token, sf_secret_key) +# str_url = sf_sync_config['sf_url'] + self.crea_url +# objs_all = self.env['stock.move.line'].search([('id', '=', self.id), ('functional_tool_name_id', '!=', False)]) +# self.get_sync_stock_move_line(objs_all, str_url, token, headers) +# +# def sync_enroll_functional_tool_move_all(self): +# logging.info('调用功能刀具出入库记录注册接口: sync_enroll_functional_tool_move_all()') +# 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(self, token, sf_secret_key) +# str_url = sf_sync_config['sf_url'] + self.crea_url +# objs_all = self.env['stock.move.line'].search([('functional_tool_name_id', '!=', False)]) +# self.get_sync_stock_move_line(objs_all, str_url, token, headers) +# +# def get_sync_stock_move_line(self, objs_all, str_url, token, headers): +# tool_stock_list = [] +# try: +# if objs_all: +# for item in objs_all: +# val = { +# 'id': item.id, +# 'name': item.functional_tool_name, +# 'code': item.code, +# 'rfid': item.rfid, +# 'tool_groups_name': item.tool_groups_id.name, +# 'reference': item.reference, +# 'barcode': item.lot_id.name, +# 'functional_tool_type_code': item.functional_tool_type_id.code, +# 'diameter': item.diameter, +# 'knife_tip_r_angle': item.knife_tip_r_angle, +# 'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'), +# 'location_id': item.location_id.name, +# 'location_dest_name': item.location_dest_id.name, +# 'date': item.date.strftime('%Y-%m-%d %H:%M:%S'), +# 'qty_done': item.qty_done, +# } +# tool_stock_list.append(val) +# kw = json.dumps(tool_stock_list, ensure_ascii=False) +# r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) +# ret = r.json() +# if ret.get('code') == 200: +# return "功能刀具出入库记录注册成功" +# else: +# logging.info('没有注册功能刀具出入库记录信息') +# except Exception as e: +# logging.info("捕获错误信息:%s" % e) +# +# @api.model_create_multi +# def create(self, vals_list): +# records = super(StockMoveLine, self).create(vals_list) +# for record in records: +# if record.functional_tool_name_id: +# record.enroll_functional_tool_move() +# return records +# +# +# class RealTimeDistributionFunctionalTools(models.Model): +# _inherit = 'sf.real.time.distribution.of.functional.tools' +# _description = '功能刀具安全库存注册' +# +# crea_url = "/api/functional_tool_distribution/create" +# +# # 注册同步功能刀具预警 +# def enroll_functional_tool_real_time_distribution(self): +# logging.info('调用功能刀具安全库存注册接口: enroll_functional_tool_real_time_distribution()') +# 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(self, token, sf_secret_key) +# str_url = sf_sync_config['sf_url'] + self.crea_url +# objs_all = self.env['sf.real.time.distribution.of.functional.tools'].search([('id', '=', self.id)]) +# self.get_sync_real_time_distribution_functional_tools(objs_all, str_url, token, headers) +# +# def sync_enroll_functional_tool_real_time_distribution_all(self): +# logging.info('调用功能刀具安全库存注册接口: sync_enroll_functional_tool_real_time_distribution_all()') +# 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(self, token, sf_secret_key) +# str_url = sf_sync_config['sf_url'] + self.crea_url +# objs_all = self.env['sf.real.time.distribution.of.functional.tools'].search([]) +# self.get_sync_real_time_distribution_functional_tools(objs_all, str_url, token, headers) +# +# def get_sync_real_time_distribution_functional_tools(self, objs_all, str_url, token, headers): +# tool_distribution_list = [] +# try: +# if objs_all: +# for item in objs_all: +# functional_tool_codes = [] +# for obj in item.sf_functional_tool_entity_ids: +# functional_tool_codes.append(obj.code) +# val = { +# 'id': item.id, +# 'name': item.name, +# 'tool_groups_name': item.tool_groups_id.name, +# 'cutting_tool_type_code': item.sf_cutting_tool_type_id.code, +# 'diameter': item.diameter, +# 'knife_tip_r_angle': item.knife_tip_r_angle, +# 'tool_stock_num': item.tool_stock_num, +# 'side_shelf_num': item.side_shelf_num, +# 'on_tool_stock_num': item.on_tool_stock_num, +# 'tool_stock_total': item.tool_stock_total, +# 'min_stock_num': item.min_stock_num, +# 'max_stock_num': item.max_stock_num, +# 'batch_replenishment_num': item.batch_replenishment_num, +# 'unit': item.unit, +# 'image': '' if not item.image else base64.b64encode(item.image).decode('utf-8'), +# 'functional_tool_codes': str(functional_tool_codes), +# 'coarse_middle_thin': item.coarse_middle_thin, +# 'whether_standard_knife': item.whether_standard_knife, +# 'suitable_machining_method_names': get_suitable_machining_method_names(item), +# 'blade_tip_characteristics_name': item.blade_tip_characteristics_id.name, +# 'handle_type_name': item.handle_type_id.name, +# 'cutting_direction_names': get_cutting_direction_names(item), +# 'suitable_coolant_names': get_suitable_coolant_names(item), +# 'active': item.active +# } +# tool_distribution_list.append(val) +# kw = json.dumps(tool_distribution_list, ensure_ascii=False) +# r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers) +# ret = r.json() +# if ret.get('code') == 200: +# return "功能刀具出入库记录注册成功" +# else: +# logging.info('没有注册功能刀具出入库记录信息') +# except Exception as e: +# logging.info("捕获错误信息:%s" % e) +# +# @api.model_create_multi +# def create(self, vals_list): +# records = super(RealTimeDistributionFunctionalTools, self).create(vals_list) +# for record in records: +# if record: +# record.enroll_functional_tool_real_time_distribution() +# return records +# +# def write(self, vals): +# res = super().write(vals) +# if vals.get('sf_functional_tool_entity_ids') or vals.get('min_stock_num') or vals.get('max_stock_num'): +# self.enroll_functional_tool_real_time_distribution() +# return res diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py index a4bcf751..eec192e1 100644 --- a/sf_tool_management/models/maintenance_equipment.py +++ b/sf_tool_management/models/maintenance_equipment.py @@ -128,12 +128,12 @@ class StockLot(models.Model): record.tool_material_status = '报废' else: record.tool_material_status = '未入库' - if record.tool_material_search_id: - # 注册刀具物料状态到cloud平台 - record.enroll_tool_material_stock() - elif record.fixture_material_search_id: - # 注册夹具物料状态到cloud平台 - record.enroll_fixture_material_stock() + # if record.tool_material_search_id: + # # 注册刀具物料状态到cloud平台 + # record.enroll_tool_material_stock() + # elif record.fixture_material_search_id: + # # 注册夹具物料状态到cloud平台 + # record.enroll_fixture_material_stock() @api.model def name_search(self, name='', args=None, operator='ilike', limit=100): diff --git a/sf_tool_management/models/temporary_data_processing_methods.py b/sf_tool_management/models/temporary_data_processing_methods.py new file mode 100644 index 00000000..e63caff7 --- /dev/null +++ b/sf_tool_management/models/temporary_data_processing_methods.py @@ -0,0 +1,38 @@ +from odoo import fields, models, api + + +class FunctionalCuttingToolEntity(models.Model): + _inherit = 'sf.functional.cutting.tool.entity' + + def button_safe_inventory_id(self): + """更新功能刀具关联的安全库存记录""" + tool_is = self.search([]) + for item in tool_is: + item.safe_inventory_id = self.env['sf.real.time.distribution.of.functional.tools'].search( + [('functional_name_id', '=', item.tool_name_id.id)])[0] + + +class FunctionalToolAssembly(models.Model): + _inherit = 'sf.functional.tool.assembly' + + def put_assembly_order_code(self): + assembly_list = self.search([('assemble_status', '=', '0')], order="id asc") + for item in assembly_list: + code = item.assembly_order_code[-9:-5] + if item.loading_task_source == '0': + code = 'C' + code + elif item.loading_task_source == '1': + code = 'J' + code + elif item.loading_task_source == '2': + code = 'K' + code + + functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().search( + [('loading_task_source', '=', item.loading_task_source), + ('assembly_order_code', 'ilike', code)], limit=1, order="id desc") + if not functional_tool_assembly: + num = "%04d" % 1 + else: + m = int(functional_tool_assembly.assembly_order_code[-3:]) + 1 + num = "%04d" % m + + item.assembly_order_code = "%s%s" % (code, num) diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py index ee60c048..07c67aa0 100644 --- a/sf_tool_management/models/tool_material_search.py +++ b/sf_tool_management/models/tool_material_search.py @@ -46,7 +46,7 @@ class ToolMaterial(models.Model): record.scrap_num = scrap_num record.number = usable_num + have_been_used_num + scrap_num # 更新数据到cloud的动态数据 - record.enroll_tool_material() + # 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 index ac98a703..76607a16 100644 --- a/sf_tool_management/views/functional_tool_views.xml +++ b/sf_tool_management/views/functional_tool_views.xml @@ -46,8 +46,8 @@
-