From bb75b73247db57aa89827f0260ee3053cb9cbdfc Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Mon, 15 Jan 2024 17:45:43 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87OEE?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=20=20=E4=BB=A5=E5=8F=8A=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_maintenance/__manifest__.py | 1 + sf_maintenance/models/__init__.py | 1 + .../sf_equipment_maintenance_standards.py | 2 +- sf_maintenance/models/sf_maintenance_logs.py | 1 + sf_maintenance/models/sf_maintenance_oee.py | 33 +++++ sf_maintenance/security/ir.model.access.csv | 3 + .../views/maintenance_equipment_oee_views.xml | 118 ++++++++++++++++++ sf_manufacturing/models/product_template.py | 4 +- sf_sale/models/auto_quatotion_common.py | 2 +- sf_sale/models/quick_easy_order.py | 4 +- 10 files changed, 163 insertions(+), 6 deletions(-) create mode 100644 sf_maintenance/models/sf_maintenance_oee.py create mode 100644 sf_maintenance/views/maintenance_equipment_oee_views.xml diff --git a/sf_maintenance/__manifest__.py b/sf_maintenance/__manifest__.py index e5a4f03b..595a5d25 100644 --- a/sf_maintenance/__manifest__.py +++ b/sf_maintenance/__manifest__.py @@ -12,6 +12,7 @@ 'security/ir.model.access.csv', 'security/ir_rule_data.xml', 'views/maintenance_logs_views.xml', + 'views/maintenance_equipment_oee_views.xml', 'views/maintenance_views.xml', 'views/equipment_maintenance_standards_views.xml', 'views/maintenance_request_views.xml', diff --git a/sf_maintenance/models/__init__.py b/sf_maintenance/models/__init__.py index 0e06b132..b177eb3c 100644 --- a/sf_maintenance/models/__init__.py +++ b/sf_maintenance/models/__init__.py @@ -1,5 +1,6 @@ # -*-coding:utf-8-*- from . import sf_maintenance +from . import sf_maintenance_oee from . import sf_maintenance_logs from . import sf_equipment_maintenance_standards from . import sf_maintenance_requests diff --git a/sf_maintenance/models/sf_equipment_maintenance_standards.py b/sf_maintenance/models/sf_equipment_maintenance_standards.py index 92a94c0e..388199da 100644 --- a/sf_maintenance/models/sf_equipment_maintenance_standards.py +++ b/sf_maintenance/models/sf_equipment_maintenance_standards.py @@ -86,7 +86,7 @@ class SfSaintenanceStandards(models.Model): images = fields.One2many('maintenance.standard.image', 'standard_id', string='反馈图片') maintenance_request_ids = fields.Many2many('maintenance.request', string='维保计划') Period = fields.Integer('周期/频次(天)') - remark = fields.Char('备注说明') + remark = fields.Char('维保记录') class MaintenanceStandardImage(models.Model): diff --git a/sf_maintenance/models/sf_maintenance_logs.py b/sf_maintenance/models/sf_maintenance_logs.py index 791f66f8..2dc26f7e 100644 --- a/sf_maintenance/models/sf_maintenance_logs.py +++ b/sf_maintenance/models/sf_maintenance_logs.py @@ -11,6 +11,7 @@ class SfMaintenanceLogs(models.Model): type = fields.Selection([('type1', '类型1'), ('type2', '类型2')], string='类型') brand = fields.Many2one('sf.machine.brand', related='maintenance_equipment_id.brand_id', string='品牌') maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='设备') + maintenance_equipment_oee_id = fields.Many2one('maintenance.equipment.oee', string='设备oee') code_location = fields.Char(string='编码位置') fault_type = fields.Selection( [('电气类', '电气类'), ('机械类', '机械类'), ('程序类', '程序类'), ('系统类', '系统类')], string='故障类型') diff --git a/sf_maintenance/models/sf_maintenance_oee.py b/sf_maintenance/models/sf_maintenance_oee.py new file mode 100644 index 00000000..71802fda --- /dev/null +++ b/sf_maintenance/models/sf_maintenance_oee.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, _ + + +class SfMaintenanceEquipmentOEE(models.Model): + _name = 'maintenance.equipment.oee' + _description = '设备OEE' + + name = fields.Char('设备oee') + equipment_id = fields.Many2one('maintenance.equipment', '设备', + domain="[('category_id.equipment_type', '=', '机床'),('state_zc', '=', '已注册')]") + type_id = fields.Many2one('sf.machine_tool.type', '型号', related='equipment_id.type_id') + machine_tool_picture = fields.Binary('设备图片', related='equipment_id.machine_tool_picture') + state = fields.Selection( + [("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"), ("空闲", "空闲"), + ("封存(报废)", "封存(报废)")], + default='正常', string="机床状态", related='equipment_id.state') + run_time = fields.Float('正常运行总时长(h)') + equipment_time = fields.Float('总时长(h)') + done_nums = fields.Integer('累计加工总件数') + utilization_rate = fields.Char('开动率') + fault_time = fields.Float('故障停机总时长(h)') + fault_nums = fields.Integer('故障次数') + sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_oee_id', '设备故障日志', + related='equipment_id.sf_maintenance_logs_ids') + + def name_get(self): + result = [] + for parameter in self: + if parameter.equipment_id: + name = parameter.equipment_id.name + result.append((parameter.id, name)) + return result \ No newline at end of file diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv index 92277bf8..998c6744 100644 --- a/sf_maintenance/security/ir.model.access.csv +++ b/sf_maintenance/security/ir.model.access.csv @@ -4,6 +4,9 @@ access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,sf_grou access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,sf_group_equipment_manager,1,1,1,0 access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,sf_group_equipment_user,1,0,0,0 access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,sf_group_equipment_manager,1,1,1,0 +access_maintenance_equipment_oee,maintenance_equipment_oee,model_maintenance_equipment_oee,sf_group_equipment_user,1,0,0,0 +access_maintenance_equipment_oee,maintenance_equipment_oee,model_maintenance_equipment_oee,sf_group_equipment_manager,1,1,1,0 +access_maintenance_equipment_oee,maintenance_equipment_oee,model_maintenance_equipment_oee,base.group_user,1,1,1,1 access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_group_equipment_user,1,0,0,0 access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_group_equipment_manager,1,1,1,0 access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_group_equipment_user,1,0,0,0 diff --git a/sf_maintenance/views/maintenance_equipment_oee_views.xml b/sf_maintenance/views/maintenance_equipment_oee_views.xml new file mode 100644 index 00000000..60055631 --- /dev/null +++ b/sf_maintenance/views/maintenance_equipment_oee_views.xml @@ -0,0 +1,118 @@ + + + + + + maintenance.oee.tree + maintenance.equipment.oee + + + + + + + + + + + + + + + + maintenance.oee.form + maintenance.equipment.oee + +
+
+ +
+ +
+

+ +

+
+ + + + + + + + + + + + + + + + + +
+ + + + + + maintenance.oee.search + maintenance.equipment.oee + + + + + + + + + + + + + + 设备OEE + ir.actions.act_window + maintenance.equipment.oee + + tree,form + + +

+ 设备OEE +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index ef635f78..c8461e8a 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -6,8 +6,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_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py index 09ea3f0f..1b29c6d2 100644 --- a/sf_sale/models/auto_quatotion_common.py +++ b/sf_sale/models/auto_quatotion_common.py @@ -2,7 +2,7 @@ import logging from odoo.modules import get_resource_path from odoo import fields, models, api -from quatotion import readSql, feature_recognize, auto_quatotion +#from quatotion import readSql, feature_recognize, auto_quatotion __author__ = 'jinling.yang' _logger = logging.getLogger(__name__) diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py index 1e5f274c..5ec1fd52 100644 --- a/sf_sale/models/quick_easy_order.py +++ b/sf_sale/models/quick_easy_order.py @@ -5,8 +5,8 @@ import os import json from datetime import datetime import requests -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 From 4f0c7ad274fc76b207343a7a8d4e52d1805f185b Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Tue, 16 Jan 2024 17:25:25 +0800 Subject: [PATCH 02/20] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E6=9C=BA=E5=8F=B0?= =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E6=8E=A5=E5=8F=A3=202.=E6=96=B0?= =?UTF-8?q?=E5=B7=A5=E4=BB=B6=E9=A2=84=E8=B0=83(=E5=89=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=89=E5=85=83=E6=A3=80=E6=B5=8B)=E6=8E=A5=E5=8F=A3=203.,?= =?UTF-8?q?=E6=96=B0NC=E7=A8=8B=E5=BA=8F=E4=B8=8B=E8=BD=BD=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/commons/common.py | 10 ++ sf_manufacturing/controllers/controllers.py | 107 +++++++++++++++++++- 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/sf_base/commons/common.py b/sf_base/commons/common.py index 05a2143f..6bf597cc 100644 --- a/sf_base/commons/common.py +++ b/sf_base/commons/common.py @@ -19,3 +19,13 @@ class Common(models.Model): 'TIMESTAMP': str(timestamp), 'checkstr': check_sf_str} return headers + + def get_add_time(self, parse_time): + """ + 把时间增加8小时 + :return: + """ + dt = datetime.datetime.strptime(parse_time, "%Y-%m-%d %H:%M:%S") + d = dt + datetime.timedelta(hours=8) + nTime = d.strftime("%Y-%m-%d %H:%M:%S") + return nTime diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index c4fd6b87..b00c1324 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import logging import json -import base64 from odoo import http from odoo.http import request @@ -40,3 +39,109 @@ class Manufacturing_Connect(http.Controller): res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} logging.info('get_Work_Info error:%s' % e) return json.JSONEncoder().encode(res) + + @http.route('/AutoDeviceApi/GetShiftPlan', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False, + cors="*") + def get_ShiftPlan(self, **kw): + """ + 自动化每天获取机台日计划 + :param kw: + :return: + """ + logging.info('get_ShiftPlan:%s' % kw) + try: + res = {'Succeed': True, 'Datas': []} + datas = request.httprequest.data + ret = json.loads(datas) + ret = json.loads(ret['result']) + logging.info('RfidCode:%s' % ret) + workorder = request.env['mrp.workorder'].sudo().search([('name', '=', ret['ProductionLine'])]) + if workorder: + for item in workorder: + date_planned_start = '' + date_planned_finished = '' + if item.date_planned_start is not False: + planned_start = item.date_planned_start.strftime("%Y-%m-%d %H:%M:%S") + date_planned_start = request.env['sf.sync.common'].sudo().get_add_time(planned_start) + if item.date_planned_finished is not False: + planned_finished = item.date_planned_finished.strftime("%Y-%m-%d %H:%M:%S") + date_planned_finished = request.env['sf.sync.common'].sudo().get_add_time(planned_finished) + res['Datas'].append({ + 'BillId': item.production_id.name, + 'RfidCode': item.RfidCode, + 'CraftName': item.name, + 'Quantity': 1, + 'WortkStart': date_planned_start, + 'WorkEnd': date_planned_finished, + 'MaterialId': item.product_id.default_code, + 'MaterialName': item.product_id.name, + # 'Spec':item.mat, + 'Material': item.materials_type_id.name + }) + except Exception as e: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} + logging.info('get_ShiftPlan error:%s' % e) + return json.JSONEncoder().encode(res) + + @http.route('/AutoDeviceApi/QcCheck', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False, + cors="*") + def get_qcCheck(self, **kw): + """ + 工件预调(前置三元检测) + 1、前置三元检测在产线外：三元检测设备把测量信息上传给MES， + MES生成检测定位数据。中控系统传递RFID编号给MES获取测量偏置结果。（来源为三元检测工单上的字段） + :param kw: + :return: + """ + logging.info('get_qcCheck:%s' % kw) + try: + res = {'Succeed': True, 'Datas': []} + datas = request.httprequest.data + ret = json.loads(datas) + ret = json.loads(ret['result']) + logging.info('RfidCode:%s' % ret) + workorder = request.env['mrp.workorder'].sudo().search([('routing_type', '=', '前置三元定位检测')]) + if workorder: + for item in workorder: + res['Datas'].append({ + 'XOffset': item.production_id.name, + 'YOffset': item.RfidCode, + 'ZOffet': item.name, + 'COffset': 1 + }) + except Exception as e: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} + logging.info('get_qcCheck error:%s' % e) + return json.JSONEncoder().encode(res) + + @http.route('/AutoDeviceApi/QcCheck', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False, + cors="*") + def get_qcCheck(self, **kw): + """ + 工件预调(前置三元检测) + 1、前置三元检测在产线外：三元检测设备把测量信息上传给MES， + MES生成检测定位数据。中控系统传递RFID编号给MES获取测量偏置结果。（来源为三元检测工单上的字段） + :param kw: + :return: + """ + logging.info('get_qcCheck:%s' % kw) + try: + res = {'Succeed': True, 'Datas': []} + datas = request.httprequest.data + ret = json.loads(datas) + ret = json.loads(ret['result']) + logging.info('RfidCode:%s' % ret) + workorder = request.env['mrp.workorder'].sudo().search([('routing_type', '=', '前置三元定位检测')]) + if workorder: + for item in workorder: + res['Datas'].append({ + 'XOffset': item.production_id.name, + 'YOffset': item.RfidCode, + 'ZOffet': item.name, + 'COffset': 1 + }) + except Exception as e: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} + logging.info('get_qcCheck error:%s' % e) + return json.JSONEncoder().encode(res) + From 7520d71adbc629c7a7de41bd7984a7c3d849bcea Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Tue, 16 Jan 2024 17:30:59 +0800 Subject: [PATCH 03/20] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E6=9C=BA?= =?UTF-8?q?=E5=BA=8A=E6=A8=A1=E5=9E=8B=E7=9A=84=E6=A0=87=E5=87=86=E5=88=80?= =?UTF-8?q?=E5=BA=93=E5=AF=B9=E8=B1=A1=EF=BC=8C=E5=88=A0=E9=99=A4=E4=BA=86?= =?UTF-8?q?=E5=88=B6=E9=80=A0=E6=A8=A1=E5=9D=97=E4=B8=AD=E6=9C=BA=E5=BA=8A?= =?UTF-8?q?=E5=88=80=E4=BD=8D=E6=A8=A1=E5=9E=8B=E5=A4=A7=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=9C=A8=E5=88=80=E5=85=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=E4=B8=AD=E9=80=9A=E8=BF=87=E7=BB=A7?= =?UTF-8?q?=E6=89=BF=E6=9C=BA=E5=BA=8A=E5=88=80=E4=BD=8D=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9C=BA=E5=BA=8Afrom=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=88=80=E4=BD=8D=E7=9A=84tree=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E6=96=B0=E5=A2=9E=E5=A4=A7=E9=87=8F=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9B2=E3=80=81=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9Econtrollers=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=96=87=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=9C=BA?= =?UTF-8?q?=E5=BA=8A=E5=BD=93=E5=89=8D=E5=88=80=E5=BA=93=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/product_template.py | 8 ++- .../views/sf_maintenance_equipment.xml | 13 +---- sf_tool_management/__init__.py | 1 + sf_tool_management/__manifest__.py | 1 + sf_tool_management/controllers/__init__.py | 1 + sf_tool_management/controllers/controllers.py | 56 +++++++++++++++++++ .../models/maintenance_equipment.py | 15 ++++- .../views/sf_maintenance_equipment.xml | 32 +++++++++++ sf_tool_management/wizard/wizard.py | 2 +- 9 files changed, 112 insertions(+), 17 deletions(-) create mode 100644 sf_tool_management/controllers/__init__.py create mode 100644 sf_tool_management/controllers/controllers.py create mode 100644 sf_tool_management/views/sf_maintenance_equipment.xml diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 42a392e2..b9209d57 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -870,6 +870,11 @@ class SfMaintenanceEquipmentTool(models.Model): _description = '机床刀位' equipment_id = fields.Many2one('maintenance.equipment', string='设备') + + code = fields.Char('机床刀位号') + name = fields.Char('刀位号', compute='_compute_name') + + # 待删除字段 product_template_id = fields.Many2one('product.template', string='功能刀具名称', domain="[('categ_type', '=', '刀具')]") image_1920 = fields.Binary('图片', related='product_template_id.image_1920') @@ -882,9 +887,6 @@ class SfMaintenanceEquipmentTool(models.Model): life_value_max = fields.Char('最大寿命值') alarm_value = fields.Char('报警值') used_value = fields.Char('已使用值') - code = fields.Char('机床刀位号') - - name = fields.Char('', compute='_compute_name') @api.depends('code') def _compute_name(self): diff --git a/sf_manufacturing/views/sf_maintenance_equipment.xml b/sf_manufacturing/views/sf_maintenance_equipment.xml index a2d9437d..b398f994 100644 --- a/sf_manufacturing/views/sf_maintenance_equipment.xml +++ b/sf_manufacturing/views/sf_maintenance_equipment.xml @@ -1,7 +1,7 @@ - + 设备增加刀具库位table sf_manufacturing_equipment.form maintenance.equipment @@ -13,17 +13,6 @@ - - - - - - - - - - - diff --git a/sf_tool_management/__init__.py b/sf_tool_management/__init__.py index fb05df81..ea8e8e0b 100644 --- a/sf_tool_management/__init__.py +++ b/sf_tool_management/__init__.py @@ -1,6 +1,7 @@ # -*-coding:utf-8-*- from . import models from . import wizard +from . import controllers from odoo import api, SUPERUSER_ID diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py index e334c32a..faf3927b 100644 --- a/sf_tool_management/__manifest__.py +++ b/sf_tool_management/__manifest__.py @@ -16,6 +16,7 @@ 'security/ir.model.access.csv', 'wizard/wizard_view.xml', 'views/tool_base_views.xml', + 'views/sf_maintenance_equipment.xml', 'views/menu_view.xml', 'views/tool_material_search.xml', ], diff --git a/sf_tool_management/controllers/__init__.py b/sf_tool_management/controllers/__init__.py new file mode 100644 index 00000000..e046e49f --- /dev/null +++ b/sf_tool_management/controllers/__init__.py @@ -0,0 +1 @@ +from . import controllers diff --git a/sf_tool_management/controllers/controllers.py b/sf_tool_management/controllers/controllers.py new file mode 100644 index 00000000..0e60a57f --- /dev/null +++ b/sf_tool_management/controllers/controllers.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +import logging +import json +import base64 +from odoo import http +from odoo.http import request + + +class Manufacturing_Connect(http.Controller): + + @http.route('/AutoDeviceApi/FeedBackOut', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False, + cors="*") + def get_equipment_tool_Info(self, **kw): + """ + 机床当前刀库实时信息 + :param kw: + :return: + """ + logging.info('get_equipment_tool_Info:%s' % kw) + try: + datas = request.httprequest.data + ret = json.loads(datas) + ret = json.loads(ret['result']) + logging.info('DeviceId:%s' % ret) + equipment = request.env['maintenance.equipment'].sudo().search([('name', '=', ret['DeviceId'])]) + + res = {'Succeed': True, 'Datas': []} + if equipment: + for item in equipment: + data = [] + for equipment_tool_id in item.product_template_ids: + functional_tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search( + [('code', '=', equipment_tool_id.tool_code)]) + alarm_time = None + if functional_tool_id.functional_tool_status == '报警': + alarm_time = self.env['sf.functional.tool.warning'].sudo().search( + [('code', '=', equipment_tool_id.tool_code)]).alarm_time + equipment_tool = { + 'RfidCode': None, + 'ToolId': equipment_tool_id.code, + 'ToolName': equipment_tool_id.functional_tool_name_id.name, + 'MaxLife': equipment_tool_id.life_value_max, + 'UseLife': equipment_tool_id.used_value, + 'AddDatetime': equipment_tool_id.tool_install_time, + 'State': functional_tool_id.functional_tool_status, + 'WarnDate': alarm_time if alarm_time else False + } + data.append(equipment_tool) + res['Datas'].append({ + 'DeviceId': item.name, + 'Data': data + }) + except Exception as e: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} + logging.info('get_equipment_tool_Info error:%s' % e) + return json.JSONEncoder().encode(res) diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py index f5371a3f..1f42430c 100644 --- a/sf_tool_management/models/maintenance_equipment.py +++ b/sf_tool_management/models/maintenance_equipment.py @@ -1,9 +1,22 @@ -from odoo import models, api +from odoo import models, api, fields class SfMaintenanceEquipmentTool(models.Model): _inherit = 'maintenance.equipment.tool' + functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具名称') + + image = fields.Binary('图片', related='functional_tool_name_id.image') + tool_code = fields.Char('功能刀具编码', related='functional_tool_name_id.code') + functional_tool_type = fields.Char('功能刀具类型', related='functional_tool_name_id.sf_cutting_tool_type_id.name') + tool_groups = fields.Char('刀具组', related='functional_tool_name_id.tool_groups_id.name') + diameter = fields.Integer('直径(mm)', related='functional_tool_name_id.functional_tool_diameter') + knife_tip_r_angle = fields.Float('刀尖R角(mm)', related='functional_tool_name_id.knife_tip_r_angle') + life_value_max = fields.Integer('最大寿命值(min)', related='functional_tool_name_id.max_lifetime_value') + alarm_value = fields.Integer('报警值(min)', related='functional_tool_name_id.alarm_value') + used_value = fields.Integer('已使用值(min)', related='functional_tool_name_id.used_value') + tool_install_time = fields.Datetime('机内装刀时间') + @api.model_create_multi def create(self, vals_list): tools = super().create(vals_list) diff --git a/sf_tool_management/views/sf_maintenance_equipment.xml b/sf_tool_management/views/sf_maintenance_equipment.xml new file mode 100644 index 00000000..fd863a84 --- /dev/null +++ b/sf_tool_management/views/sf_maintenance_equipment.xml @@ -0,0 +1,32 @@ + + + + + sf_manufacturing_equipment.form + maintenance.equipment + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index 396aa703..9f1a1aae 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -41,7 +41,7 @@ class ToolChangeRequirementInformation(models.TransientModel): replacement_tool_setting_length = fields.Float(string='待换刀具总长度(mm)', required=True) replacement_extension_length = fields.Float(string='待换刀具伸出长(mm)') replacement_effective_length = fields.Float(string='待换刀具有效长(mm)') - replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], requirded=True, + replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], required=True, string='待换刀具粗/中/精', default='3') replacement_max_lifetime_value = fields.Integer(string='待换刀具最大寿命值(min)') From 2b7243f69c29b3804b87718bce25c405f1f9e5b5 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Wed, 17 Jan 2024 17:26:24 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E5=90=88=E5=B9=B6cnc=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E5=92=8C=E5=90=8E=E7=BD=AE=E6=A3=80=E6=B5=8B=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=8D=95=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/maintenance_logs_views.xml | 1 - sf_manufacturing/controllers/controllers.py | 69 +++++++++++++++++++ sf_manufacturing/models/mrp_production.py | 8 +-- .../models/mrp_routing_workcenter.py | 2 +- sf_manufacturing/models/mrp_workorder.py | 8 +-- sf_manufacturing/views/mrp_workorder_view.xml | 29 ++++---- 6 files changed, 93 insertions(+), 24 deletions(-) diff --git a/sf_maintenance/views/maintenance_logs_views.xml b/sf_maintenance/views/maintenance_logs_views.xml index b0d6af79..087f6ffb 100644 --- a/sf_maintenance/views/maintenance_logs_views.xml +++ b/sf_maintenance/views/maintenance_logs_views.xml @@ -8,7 +8,6 @@ - diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index c4fd6b87..221d620b 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -40,3 +40,72 @@ class Manufacturing_Connect(http.Controller): res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} logging.info('get_Work_Info error:%s' % e) return json.JSONEncoder().encode(res) + + + @http.route('/AutoDeviceApi/FeedBackStart', type='json', auth='none', methods=['GET', 'POST'], csrf=False, + cors="*") + def button_Work_START(self, **kw): + """ + 工单任务开始 + :param kw: + :return: + """ + logging.info('get_Work_Info:%s' % kw) + try: + res = {'Succeed': True, 'Datas': []} + datas = request.httprequest.data + ret = json.loads(datas) + if not ret['BillId']: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未传制造订单号'} + return json.JSONEncoder().encode(res) + if not ret['CraftId']: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未传工序名称'} + return json.JSONEncoder().encode(res) + if not ret['DeviceId']: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未传设备号'} + return json.JSONEncoder().encode(res) + production_id = ret['BillId'] + routing_type = ret['CraftId'] + workorder = request.env['mrp.workorder'].sudo().search( + [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1) + workorder.button_start() + + + except Exception as e: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} + logging.info('get_Work_Info error:%s' % e) + return json.JSONEncoder().encode(res) + + @http.route('/AutoDeviceApi/FeedBackEnd', type='json', auth='none', methods=['GET', 'POST'], csrf=False, + cors="*") + def button_Work_End(self, **kw): + """ + 工单任务结束 + :param kw: + :return: + """ + logging.info('get_Work_Info:%s' % kw) + try: + res = {'Succeed': True, 'Datas': []} + datas = request.httprequest.data + ret = json.loads(datas) + if not ret['BillId']: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未传制造订单号'} + return json.JSONEncoder().encode(res) + if not ret['CraftId']: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未传工序名称'} + return json.JSONEncoder().encode(res) + if not ret['DeviceId']: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未传设备号'} + return json.JSONEncoder().encode(res) + production_id = ret['BillId'] + routing_type = ret['CraftId'] + workorder = request.env['mrp.workorder'].sudo().search( + [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1) + workorder.button_finish() + + + except Exception as e: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} + logging.info('get_Work_Info error:%s' % e) + return json.JSONEncoder().encode(res) diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index 185817e9..0ce21c8f 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -453,10 +453,10 @@ class MrpProduction(models.Model): 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 == '后置三元质量检测': + # 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_routing_workcenter.py b/sf_manufacturing/models/mrp_routing_workcenter.py index c8e7d8aa..d989f233 100644 --- a/sf_manufacturing/models/mrp_routing_workcenter.py +++ b/sf_manufacturing/models/mrp_routing_workcenter.py @@ -10,7 +10,7 @@ class ResMrpRoutingWorkcenter(models.Model): ('装夹预调', '装夹预调'), # ('前置三元定位检测', '前置三元定位检测'), ('CNC加工', 'CNC加工'), - ('后置三元质量检测', '后置三元质量检测'), + # ('后置三元质量检测', '后置三元质量检测'), ('解除装夹', '解除装夹'), ('切割', '切割'), ('表面工艺', '表面工艺') diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index feb37787..e1589bd9 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -35,7 +35,7 @@ class ResMrpWorkOrder(models.Model): ('装夹预调', '装夹预调'), # ('前置三元定位检测', '前置三元定位检测'), ('CNC加工', 'CNC加工'), - ('后置三元质量检测', '后置三元质量检测'), + # ('后置三元质量检测', '后置三元质量检测'), ('解除装夹', '解除装夹'), ('切割', '切割'), ('表面工艺', '表面工艺') ], string="工序类型") @@ -216,9 +216,9 @@ class ResMrpWorkOrder(models.Model): elif route.routing_type == 'CNC加工': duration_expected = self.env['mrp.routing.workcenter'].sudo().search( [('name', '=', 'CNC加工')]).time_cycle - elif route.routing_type == '后置三元质量检测': - duration_expected = self.env['mrp.routing.workcenter'].sudo().search( - [('name', '=', '后置三元质量检测')]).time_cycle + # elif route.routing_type == '后置三元质量检测': + # duration_expected = self.env['mrp.routing.workcenter'].sudo().search( + # [('name', '=', '后置三元质量检测')]).time_cycle elif route.routing_type == '解除装夹': duration_expected = self.env['mrp.routing.workcenter'].sudo().search( [('name', '=', '解除装夹')]).time_cycle diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml index 8a9214e9..d7c911fa 100644 --- a/sf_manufacturing/views/mrp_workorder_view.xml +++ b/sf_manufacturing/views/mrp_workorder_view.xml @@ -398,6 +398,21 @@ + + + + + + + + +
+
+ + @@ -423,20 +438,6 @@ - - - - - - - -
-
- - From d9115333bfdc75cdcf21f47ef7a3b8913ce91618 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Wed, 17 Jan 2024 17:30:16 +0800 Subject: [PATCH 05/20] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96CAM=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E7=A8=8B=E5=BA=8F=E7=94=A8=E5=88=80=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=A4=A7=E9=87=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96tree=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E5=8F=8Aform=E8=A7=86=E5=9B=BE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8F=8A=E5=85=B6=E5=B8=83=E5=B1=80=EF=BC=9B2=E3=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0CAM=E6=8D=A2=E5=88=80=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E6=92=A4=E9=94=80=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8F=8A=E5=85=B6=E6=8C=89=E9=92=AE=EF=BC=9B3=E3=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE=E5=88=80=E5=85=B7=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=92=8C=E5=88=80=E5=85=B7=E5=90=8D=E7=A7=B0=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=E7=8E=B0=E6=9C=89=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=BB=A1=E8=B6=B3=E9=9C=80=E6=B1=82=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=B8=8D=E6=BB=A1=E8=B6=B3=E5=88=99=E5=88=9B?= =?UTF-8?q?=E5=BB=BACAM=E5=B7=A5=E5=8D=95=E7=A8=8B=E5=BA=8F=E7=94=A8?= =?UTF-8?q?=E5=88=80=E8=AE=A1=E5=88=92=E8=AE=B0=E5=BD=95=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=8E=A5=E5=8F=A3(=E8=BF=9B=E8=A1=8C=E4=B8=AD)?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/base.py | 69 +++++++--- sf_tool_management/views/tool_base_views.xml | 128 +++++++++++-------- 2 files changed, 125 insertions(+), 72 deletions(-) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 39805f58..97447936 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -594,16 +594,16 @@ class CAMWorkOrderProgramKnifePlan(models.Model): _name = 'sf.cam.work.order.program.knife.plan' _description = 'CAM工单程序用刀计划' - name = fields.Char(string='工单任务编号', readonly=False) - cam_procedure_code = fields.Char(string='CAM程序编号', readonly=False) - cam_cutter_spacing_code = fields.Char(string='CAM刀位号', readonly=False) + name = fields.Char('工单任务编号') + cam_procedure_code = fields.Char('程序名') + filename = fields.Char('文件') + cam_cutter_spacing_code = fields.Char('刀号') tool_position_interface_type = fields.Selection( [('BT刀柄式', 'BT刀柄式'), ('SK刀柄式', 'SK刀柄式'), ('HSK刀柄式', 'HSK刀柄式'), ('CAT刀柄式', 'CAT刀柄式'), ('ISO刀盘式', 'ISO刀盘式'), ('DIN刀盘式', 'DIN刀盘式'), ('直装固定式', '直装固定式')], string='刀位接口型号') - production_line_id = fields.Many2one('sf.production.line', string='生产线', readonly=False, - group_expand='_read_group_names') - machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=False, + production_line_id = fields.Many2one('sf.production.line', string='生产线', group_expand='_read_group_names') + machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', domain="[('production_line_id', '=', production_line_id)]") machine_table_name = fields.Char(string='机台号', readonly=True, related='machine_table_name_id.name') cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', required=True, @@ -616,8 +616,9 @@ class CAMWorkOrderProgramKnifePlan(models.Model): barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', domain=[('product_id.name', '=', '功能刀具')]) - functional_tool_name = fields.Char(string='功能刀具名称', required=True) + functional_tool_name = fields.Char(string='功能刀具名称', compute='_compute_functional_tool_name') functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=False) + tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组') diameter = fields.Integer(string='刀具直径(mm)', readonly=False) tool_included_angle = fields.Float(string='刀尖R角(mm)', readonly=False) tool_loading_length = fields.Float(string='总长度(mm)', readonly=False) @@ -629,12 +630,28 @@ class CAMWorkOrderProgramKnifePlan(models.Model): L_D = fields.Float(string='L/D值', readonly=False) clearance_length = fields.Float(string='避空长(mm)', readonly=False) required_cutting_time = fields.Integer(string='需切削时长', readonly=False) + process_type = fields.Char('加工类型') + margin_x_y = fields.Float('余量_X/Y') + margin_z = fields.Float('余量_Z') + finish_depth = fields.Float('加工深度') + shank_model = fields.Char('刀柄型号') + estimated_processing_time = fields.Char('预计加工时间') plan_execute_status = fields.Selection([('0', '待下发'), ('1', '执行中'), ('2', '已完成')], string='计划执行状态', default='0', readonly=False) sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装', readonly=True) + @api.depends('diameter', 'tool_included_angle', 'tool_groups_id') + def _compute_functional_tool_name(self): + for obj in self: + if obj.tool_groups_id: + obj.functional_tool_name = '%s-D%sR%s' % ( + obj.tool_groups_id.name, obj.diameter, + obj.tool_included_angle) + else: + obj.functional_tool_name = None + @api.model def _read_group_names(self, categories, domain, order): names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) @@ -646,27 +663,34 @@ class CAMWorkOrderProgramKnifePlan(models.Model): :return: """ record = self.env['sf.functional.tool.assembly'].create({ - 'barcode_id': self.barcode_id.id, - 'functional_tool_name_id': self.functional_tool_name_id.id, + 'functional_tool_name': self.functional_tool_name, 'functional_tool_type_id': self.functional_tool_type_id.id, + 'tool_groups_id': self.tool_groups_id.id, 'functional_tool_diameter': self.diameter, - 'functional_tool_length': self.tool_loading_length, - 'loading_task_source': '0', - 'coarse_middle_thin': None, - 'tool_loading_length': None, - 'applicant': self.env.user.name, - 'reason_for_applying': self.reason_for_applying, - 'use_tool_time': self.need_knife_time, + 'knife_tip_r_angle': self.tool_included_angle, + 'tool_loading_length': self.tool_loading_length, + 'functional_tool_length': self.extension_length, + 'effective_length': self.effective_length, + 'whether_standard_knife': self.whether_standard_knife, + 'coarse_middle_thin': self.coarse_middle_thin, + 'new_former': self.new_former, + 'production_line_name_id': self.production_line_id.id, 'machine_tool_name_id': self.machine_table_name_id.id, - 'machine_tool_code': self.cam_procedure_code, - 'cutter_spacing_code': self.cam_cutter_spacing_code, + 'cutter_spacing_code_id': self.env['maintenance.equipment.tool'].sudo().search( + [('code', '=', self.cam_cutter_spacing_code), ('equipment_id', '=', self.machine_table_name_id.id)]).id, + + 'loading_task_source': '0', + 'applicant': self.env.user.name, + 'use_tool_time': self.need_knife_time, + 'reason_for_applying': '工单用刀', + 'sf_cam_work_order_program_knife_plan_id': self.id }) self.sf_functional_tool_assembly_id = record.id # 将计划执行状态改为执行中 self.env['sf.cam.work.order.program.knife.plan'].search( - [('barcode_id', '=', self.barcode_id.id)]).write( + [('name', '=', self.name), ('functional_tool_name', '=', self.functional_tool_name)]).write( {'plan_execute_status': '1', 'applicant': self.env.user.name}) @@ -676,16 +700,19 @@ class CAMWorkOrderProgramKnifePlan(models.Model): :return: """ self.env['sf.functional.tool.assembly'].search( - [('barcode_id', '=', self.barcode_id.id), + [('assembly_order_code', '=', self.sf_functional_tool_assembly_id.assembly_order_code), ('loading_task_source', '=', '0')]).unlink() # 将计划执行状态改为待执行，同时清除申请人、功能刀具组装字段数据 self.env['sf.cam.work.order.program.knife.plan'].search( - [('barcode_id', '=', self.barcode_id.id)]).write( + [('name', '=', self.name), ('functional_tool_name', '=', self.functional_tool_name)]).write( {'plan_execute_status': '0', 'applicant': None, 'sf_functional_tool_assembly_id': None}) + def create_cam_work_plan(self, **kw): + pass + class FunctionalToolAssembly(models.Model): _name = 'sf.functional.tool.assembly' diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index dd8e3bf0..fb8b3a5e 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -756,21 +756,29 @@ + + + + + + + + + + + + + + + - - - - - - - - - - - - + +