From 1b6ca90bd4d0d2fc540715929296b9bb69922c89 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Tue, 21 May 2024 09:23:47 +0800 Subject: [PATCH 01/53] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=88=80?= =?UTF-8?q?=E5=85=B7=E3=80=81=E5=A4=B9=E5=85=B7=E5=90=8C=E6=AD=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9B=E5=85=B3=E9=97=AD=E5=88=80=E5=85=B7=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=8E=A5=E5=8F=A3=E7=9A=84=E5=AE=9E=E6=97=B6=E8=B0=83?= =?UTF-8?q?=E7=94=A8=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/data/tool_data.xml | 4 +- sf_tool_management/models/fixture_enroll.py | 110 ++-- .../models/functional_tool_enroll.py | 605 +++++++++--------- .../models/maintenance_equipment.py | 12 +- .../models/tool_material_search.py | 2 +- .../views/functional_tool_views.xml | 4 +- sf_tool_management/wizard/wizard.py | 26 +- 7 files changed, 390 insertions(+), 373 deletions(-) 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/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_enroll.py b/sf_tool_management/models/functional_tool_enroll.py index 0d076ddf..e69ebdd8 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'] @@ -242,256 +248,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/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..90dfbb42 100644 --- a/sf_tool_management/views/functional_tool_views.xml +++ b/sf_tool_management/views/functional_tool_views.xml @@ -46,8 +46,8 @@
-
- - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + From 4f6e4a8ed3e615f4232d2f70bd31b0148d7746d9 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Wed, 22 May 2024 15:04:37 +0800 Subject: [PATCH 04/53] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=88=80?= =?UTF-8?q?=E5=85=B7=E9=A2=84=E8=B0=83=E4=BB=AA=E6=8E=A5=E5=8F=A3=E5=8F=8A?= =?UTF-8?q?=E5=85=B6=E5=86=99=E5=85=A5=E5=88=B0=E5=BC=B9=E7=AA=97=E7=9A=84?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=9B=B4=E6=94=B9=E5=88=80=E5=85=B7?= =?UTF-8?q?=E6=80=BB=E9=95=BF=E5=BA=A6(=E9=AB=98=E5=BA=A6)=E3=80=81?= =?UTF-8?q?=E7=9B=B4=E5=BE=84=E5=92=8CR=E8=A7=92=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=9A=84=E7=B2=BE=E7=A1=AE=E5=BA=A6=E4=B8=BA=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E7=82=B9=E5=90=8E=E4=B8=89=E4=BD=8D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/controllers/controllers.py | 23 +++++++-------- sf_tool_management/models/base.py | 28 +++++++++---------- sf_tool_management/views/tool_base_views.xml | 2 +- sf_tool_management/wizard/wizard.py | 9 +++--- 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/sf_tool_management/controllers/controllers.py b/sf_tool_management/controllers/controllers.py index fedaa25f..0c61f486 100644 --- a/sf_tool_management/controllers/controllers.py +++ b/sf_tool_management/controllers/controllers.py @@ -37,7 +37,7 @@ class Manufacturing_Connect(http.Controller): logging.info('get_functional_tool_groups_Info error:%s' % e) return json.JSONEncoder().encode(res) - @http.route('/AutoDeviceApi/PutToolParameter', type='json', auth='none', methods=['GET', 'POST'], csrf=False, + @http.route('/AutoDeviceApi/PutToolParameter', type='http', auth='none', methods=['GET', 'POST'], csrf=False, cors="*") def put_tool_preset_parameter_port(self, **kw): """ @@ -49,20 +49,21 @@ class Manufacturing_Connect(http.Controller): res = {'Succeed': True, 'Datas': []} try: datas = request.httprequest.data - ret = json.loads(datas) - tool_assembly = request.env['sf.functional.tool.assembly'].sudo().search([('start_preset_bool', '=', True)]) - tool_assembly_order = request.env['sf.functional.tool.assembly.order'].sudo().search([]) + 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])]) if not tool_assembly: return json.JSONEncoder().encode( - {'Succeed': False, 'ErrorCode': 201, 'Error': '没有找到正在组装的组装单！'}) + {'Succeed': False, 'ErrorCode': 201, 'Error': '没有找到组装单！'}) tool_assembly.write({ - 'after_assembly_tool_loading_length': ret['loading_length'], - 'after_assembly_functional_tool_length': ret['functional_tool_length'], - 'after_assembly_max_lifetime_value': ret['max_lifetime_value'], - 'after_assembly_alarm_value': 100, - 'after_assembly_effective_length': 100 + 'after_assembly_tool_loading_length': float(data_list[1]), # 高度(总长度) + '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': '缺少%s字段信息' % 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/models/base.py b/sf_tool_management/models/base.py index be10f803..26cf43e7 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -543,8 +543,8 @@ class FunctionalToolAssembly(models.Model): 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) @@ -556,7 +556,7 @@ 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_tool_loading_length = fields.Float(string='组装后总长度(mm)', readonly=True, digits=(10, 3)) after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True) after_assembly_effective_length = fields.Float(string='组装后有效长(mm)', readonly=True) L_D_number = fields.Float(string='L/D值(mm)', readonly=True) @@ -610,24 +610,24 @@ class FunctionalToolAssembly(models.Model): 自动生成组装单编码 """ 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/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index e0f13596..985c28a5 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -491,7 +491,7 @@ - + diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index 026cd9c0..17a84630 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -463,8 +463,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel): after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', compute='_compute_name', store=True) after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='组装后功能刀具类型') - after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)') - after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)') + after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', digits=(10, 3)) + after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', digits=(10, 3)) after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', default='0') cut_time = fields.Integer(string='已切削时间(min)') cut_length = fields.Float(string='已切削长度(mm)') @@ -476,7 +476,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)') after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)') after_assembly_used_value = fields.Integer(string='组装后已使用值(min)') - after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)') + after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', digits=(10, 3)) after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', required=True) after_assembly_effective_length = fields.Float(string='组装后有效长(mm)') L_D_number = fields.Float(string='L/D值(mm)', compute='_compute_l_d_number') @@ -491,7 +491,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel): self.write({ 'after_assembly_tool_loading_length': tool.after_assembly_tool_loading_length, # 总长度 - 'after_assembly_functional_tool_length': tool.after_assembly_functional_tool_length # 伸出长 + 'after_assembly_functional_tool_diameter': tool.after_assembly_functional_tool_diameter, # 直径 + 'after_assembly_knife_tip_r_angle': tool.after_assembly_knife_tip_r_angle # R角 }) return { From ff12a8640656b6382fef659b586087a87bba5a9e Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Wed, 22 May 2024 17:35:57 +0800 Subject: [PATCH 05/53] =?UTF-8?q?=E4=BC=98=E5=8C=96cnc=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E8=BF=94=E5=B7=A5=EF=BC=9A=E5=9C=A8=E5=8E=9F=E6=9C=89=E7=9A=84?= =?UTF-8?q?cnc=E5=B7=A5=E5=8D=95=E5=90=8E=E6=96=B0=E5=A2=9E=E8=BF=94?= =?UTF-8?q?=E5=B7=A5=E6=A0=87=E5=BF=97=E7=9A=84cnc=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E4=B8=94=E5=B7=A5=E5=BA=8F=E7=B4=AF=E5=8A=A0=EF=BC=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E5=B0=B1=E7=BB=AA=EF=BC=8C=E8=A7=A3?= =?UTF-8?q?=E9=99=A4=E8=A3=85=E5=A4=B9=E5=B7=A5=E5=8D=95=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E7=AD=89=E5=BE=85=E5=85=B6=E4=BB=96=E5=B7=A5?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_production.py | 30 ++++++++----------- sf_manufacturing/models/mrp_workorder.py | 2 ++ sf_manufacturing/models/product_template.py | 4 +-- sf_manufacturing/views/mrp_workorder_view.xml | 4 +-- sf_mrs_connect/models/ftp_operate.py | 3 ++ sf_sale/models/quick_easy_order.py | 4 +-- sf_sale/models/quick_easy_order_old.py | 4 +-- 7 files changed, 25 insertions(+), 26 deletions(-) diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index fc4ccbeb..4470235c 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -406,20 +406,20 @@ 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, 'state': 'ready', 'cnc_ids': work.cnc_ids, + 'cmm_ids': work.cmm_ids}) + print(cnc_back_workorder.sequence) + elif work.routing_type not in ['装夹预调'] and work != cnc_back_workorder: + work.sequence += 1 + print(work.sequence) + if work.routing_type == '解除装夹': + work.write({'state': 'pending'}) + print(work.state) # 在制造订单上新增工单 def _create_workorder1(self, k): @@ -459,13 +459,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 522c8c02..6b92fe25 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -895,6 +895,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/models/product_template.py b/sf_manufacturing/models/product_template.py index 7d9bbac5..49a7e483 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -7,8 +7,8 @@ import os from odoo import models, fields, api, _ from odoo.exceptions import ValidationError from odoo.modules import get_resource_path -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 class ResProductMo(models.Model): diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index 94f469ea..30801086 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 @@ - + 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_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py index 259655ee..775b901a 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 dc4c588f..f26b6f4a 100644 --- a/sf_sale/models/quick_easy_order_old.py +++ b/sf_sale/models/quick_easy_order_old.py @@ -6,8 +6,8 @@ import os from datetime import datetime 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 OCC.Extend.DataExchange import read_step_file +# from OCC.Extend.DataExchange import write_stl_file from odoo.addons.sf_base.commons.common import Common from odoo import models, fields, api from odoo.modules import get_resource_path From 66b4df51939ba7a8379536de189da02a3d017b18 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 23 May 2024 11:15:13 +0800 Subject: [PATCH 06/53] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=88=80?= =?UTF-8?q?=E5=85=B7=E9=A2=84=E8=B0=83=E4=BB=AA=E6=8E=A5=E5=8F=A3=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E6=96=B9=E5=BC=8F=E3=80=81?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=90=9C=E7=B4=A2=E7=BB=84=E8=A3=85=E5=8D=95?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=9B2=E3=80=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E3=80=81=E7=BB=84=E8=A3=85?= =?UTF-8?q?=E5=8D=95=E3=80=81=E7=BB=84=E8=A3=85=E5=8D=95=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E5=92=8C=E7=95=8C=E9=9D=A2=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E5=AD=97=E6=AE=B5=E5=86=85=E5=AE=B9=EF=BC=9B?= =?UTF-8?q?3=E3=80=81=E6=9B=B4=E6=94=B9=E7=BB=84=E8=A3=85=E5=8D=95?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/controllers/controllers.py | 6 +- sf_tool_management/models/__init__.py | 1 + sf_tool_management/models/base.py | 13 +- sf_tool_management/models/functional_tool.py | 16 +-- .../temporary_data_processing_methods.py | 38 ++++++ .../views/functional_tool_views.xml | 19 +-- sf_tool_management/views/tool_base_views.xml | 35 +++--- sf_tool_management/wizard/wizard.py | 33 +++-- sf_tool_management/wizard/wizard_view.xml | 116 +++++++++--------- 9 files changed, 166 insertions(+), 111 deletions(-) create mode 100644 sf_tool_management/models/temporary_data_processing_methods.py diff --git a/sf_tool_management/controllers/controllers.py b/sf_tool_management/controllers/controllers.py index 0c61f486..51bd5882 100644 --- a/sf_tool_management/controllers/controllers.py +++ b/sf_tool_management/controllers/controllers.py @@ -54,12 +54,12 @@ class Manufacturing_Connect(http.Controller): 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])]) + [('assembly_order_code', '=', data_list[0]), ('start_preset_bool', '=', True)]) if not tool_assembly: return json.JSONEncoder().encode( - {'Succeed': False, 'ErrorCode': 201, 'Error': '没有找到组装单！'}) + {'Succeed': False, 'ErrorCode': 201, 'code': data_list[0], 'Error': '没有找到正在组装的组装单！'}) tool_assembly.write({ - 'after_assembly_tool_loading_length': float(data_list[1]), # 高度(总长度) + '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角 }) 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 26cf43e7..5291d4d7 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -557,7 +557,8 @@ class FunctionalToolAssembly(models.Model): 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, digits=(10, 3)) - after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True) + 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) @@ -586,12 +587,12 @@ class FunctionalToolAssembly(models.Model): '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, - 'default_machine_tool_name_id': self.machine_tool_name_id, - 'default_cutter_spacing_code_id': self.cutter_spacing_code_id, + '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, - 'default_tool_groups_id': self.tool_groups_id, + '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, 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/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/views/functional_tool_views.xml b/sf_tool_management/views/functional_tool_views.xml index 90dfbb42..76607a16 100644 --- a/sf_tool_management/views/functional_tool_views.xml +++ b/sf_tool_management/views/functional_tool_views.xml @@ -155,24 +155,25 @@ - - + + + - + - - - - - - + + + + + + diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 985c28a5..0b00be26 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -452,8 +452,8 @@