diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index d84f633d..fecccb2d 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -196,11 +196,10 @@ class MrpProduction(models.Model): production.product_id.model_processing_panel = k processing_panel_len = len(k) for k in (production.product_id.model_processing_panel.split(',')): - routingworkcenter = self.env['sf.model.type.routing.sort'].search( - [('model_type_id', '=', production.product_id.model_type_id.id)], - - order='sequence asc' - ) + routingworkcenter = self.env['sf.product.model.type.routing.sort'].search( + [('product_model_type_id', '=', production.product_id.product_model_type_id.id)], + order='sequence asc' + ) i += 1 for route in routingworkcenter: diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 185b24ed..1df9dc75 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -189,7 +189,9 @@ class ResMrpWorkOrder(models.Model): 'production_id': self.production_id, 'state': '占用', }) - self.tray_id = values + orders = self.env['mrp.workorder'].search([('production_id', '=', self.production_id.id)]) + for a in orders: + a.tray_id = values else: raise UserError('该托盘编码已失效') else: @@ -229,7 +231,7 @@ class ResMrpWorkOrder(models.Model): tray = self.env['sf.tray'].search([("production_id", "=", self.production_id.id)]) if tray: tray.unclamp() - self.tray_id = tray + self.tray_id = False # return { # 'name': _('New Maintenance Request'), diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py index 7adf4004..bb04b9c5 100644 --- a/sf_manufacturing/models/stock.py +++ b/sf_manufacturing/models/stock.py @@ -224,6 +224,6 @@ class ProductionLot(models.Model): [('company_id', '=', company.id), ('product_id', '=', product.id)], limit=1, order='id DESC') if last_serial: - return self.env['stock.lot'].generate_lot_names1(product.display_name, last_serial.name, 2)[ + return self.env['stock.lot'].generate_lot_names1(product.name, last_serial.name, 2)[ 1] - return "%s-%03d" % (product.display_name, 1) + return "%s-%03d" % (product.name, 1) diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml index 68810a23..85bf5f6c 100644 --- a/sf_manufacturing/views/mrp_workcenter_views.xml +++ b/sf_manufacturing/views/mrp_workcenter_views.xml @@ -7,7 +7,7 @@
- -
- - - -
- - - -
- - - - - - -
-
- diff --git a/web_widget_model_viewer/views/assets.xml b/web_widget_model_viewer/views/assets.xml deleted file mode 100644 index 855f4a3e..00000000 --- a/web_widget_model_viewer/views/assets.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -