Accept Merge Request #141: (feature/页面优化 -> develop)

Merge Request: 页面优化及排产（根据胚料的长宽高比对一下机床的最大加工尺寸）

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/141?initial=true

sf_manufacturing/models/mrp_routing_workcenter.py

@@ -24,18 +24,33 @@ class ResMrpRoutingWorkcenter(models.Model):
 
     company_id = fields.Many2one('res.company', compute="get_company_id", related=False)
 
+    # 排产的时候, 根据胚料的长宽高比对一下机床的最大加工尺寸.不符合就不要分配给这个加工中心(机床).
     # 工单对应的工作中心，根据工序中的工作中心去匹配，
     # 如果只配置了一个工作中心，则默认采用该工作中心；
     # 如果有多个工作中心，
     # 则根据该工作中心的工单个数进行分配（优先分配给工单个数最少的）；
-    def get_workcenter(self, workcenter_ids):
+    def get_workcenter(self, workcenter_ids, routing_type, product):
         if workcenter_ids:
             if len(workcenter_ids) == 1:
                 return workcenter_ids[0]
             elif len(workcenter_ids) >= 2:
                 # workcenter_ids_str = ','.join([str(s) for s in workcenter_ids])
+                if routing_type == 'CNC加工':
+                    workcenter = self.env['mrp.workcenter'].search([('id', 'in', workcenter_ids)])
+                    workcenter_ids = []
+                    for item in workcenter:
+                        print(item.name)
+                        if item.machine_tool_id:
+                            machine_tool = self.env['sf.machine_tool'].search(
+                                [('x_axis', '>', product.bom_ids.bom_line_ids.product_id.length), ('y_axis', '>', product.bom_ids.bom_line_ids.product_id.width),
+                                 ('z_axis', '>', product.bom_ids.bom_line_ids.product_id.height), ('id', '=', item.machine_tool_id.id)])
+                            if machine_tool:
+                                workcenter_ids.append(item.id)
+                    if len(workcenter_ids) == 1:
+                        return workcenter_ids[0]
                 self.env.cr.execute("""
                     SELECT  workcenter_id FROM mrp_workorder where workcenter_id 
                           in  %s group by workcenter_id 
                           order by count(*),workcenter_id asc limit 1 """, [tuple(workcenter_ids)])
-                return self.env.cr.dictfetchall()[0].get('workcenter_id')
+                workcenter_id = self.env.cr.dictfetchall()[0].get('workcenter_id')
+                return workcenter_id

sf_manufacturing/models/mrp_workorder.py

@@ -146,7 +146,9 @@ class ResMrpWorkOrder(models.Model):
             'processing_panel': k,
             'routing_type': route.routing_type,
             'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
-            'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids),
+            'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
+                                                                               route.routing_type,
+                                                                               production.product_id),
             'date_planned_start': False,
             'date_planned_finished': False,
             'duration_expected': 60,
@@ -357,7 +359,9 @@ class ResMrpWorkOrder(models.Model):
             'processing_panel': k,
             'routing_type': route.routing_type,
             'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
-            'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids),
+            'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids,
+                                                                               route.routing_type,
+                                                                               production.product_id),
             'date_planned_start': False,
             'date_planned_finished': False,
             'duration_expected': 60,
@@ -463,6 +467,7 @@ class CNCprocessing(models.Model):
         cnc_workorder.time_ids.date_end = datetime.now()
         cnc_workorder.button_finish()
 
+    # 根据程序名和加工面匹配到ftp里对应的Nc程序名
     def get_cnc_processing_file(self, folder_name, cnc_processing, processing_panel):
         logging.info('folder_name:%s' % folder_name)
         serverdir = os.path.join('/tmp', folder_name, 'return', processing_panel)

sf_manufacturing/models/res_user.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from odoo import SUPERUSER_ID, _, api, fields, models, registry
+from odoo import fields, models
+
 
 class Users(models.Model):
     _inherit = 'res.users'

sf_manufacturing/models/stock.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-import logging
 from collections import defaultdict, namedtuple
 from odoo.addons.stock.models.stock_rule import ProcurementException
 from re import findall as regex_findall
 from re import split as regex_split
-from odoo import SUPERUSER_ID, _, api, fields, models, registry
-from odoo.tools import float_compare, float_is_zero, html_escape
+from odoo import SUPERUSER_ID, _, api,  models
+from odoo.tools import float_compare
 
 
 class StockRule(models.Model):

sf_manufacturing/models/tray.py

@@ -2,7 +2,7 @@
 # Part of SmartGo. See LICENSE file for full copyright and licensing details.
 import base64
 from io import BytesIO
-from odoo import api, fields, models, SUPERUSER_ID, _
+from odoo import api, fields, models
 from pystrich.code128 import Code128Encoder