优化工单，英文改为中文展示，解除托盘展示托盘

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:
 

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'),

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)