diff --git a/sf_manufacturing_orders/models/sf_production.py b/sf_manufacturing_orders/models/sf_production.py index fcce77c1..79bba3db 100644 --- a/sf_manufacturing_orders/models/sf_production.py +++ b/sf_manufacturing_orders/models/sf_production.py @@ -74,6 +74,7 @@ class MrpProduction(models.Model): 'operation_id': False, 'name': route.route_workcenter_id.name, 'processing_panel': k, + 'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids), 'date_planned_start': False, 'date_planned_finished': False, diff --git a/sf_route_workcenter/models/workcenter.py b/sf_route_workcenter/models/workcenter.py index fc20a4e9..878c0901 100644 --- a/sf_route_workcenter/models/workcenter.py +++ b/sf_route_workcenter/models/workcenter.py @@ -4,7 +4,7 @@ import base64 import logging import math -import qrcode + from io import BytesIO from odoo import api, fields, models @@ -84,7 +84,7 @@ class MrpWorkOrder(models.Model): _inherit = 'mrp.workorder' _description = '工单' - cnc_id = fields.Many2one('ir.attachment', string='CNC程序') + cnc_id = fields.Many2many('ir.attachment', 'cnc_attachment', string="cnc程序获取") tray_ids = fields.One2many('sf.tray', 'workorder_id', string='托盘') # def get_tray_info(self): # @api.onchange('X_axis', 'Y_axis', 'Z_axis') diff --git a/sf_route_workcenter/views/sf_workorder.xml b/sf_route_workcenter/views/sf_workorder.xml index f0b38b58..42dbcff4 100644 --- a/sf_route_workcenter/views/sf_workorder.xml +++ b/sf_route_workcenter/views/sf_workorder.xml @@ -9,9 +9,7 @@ - - - + @@ -19,6 +17,8 @@ + +