Accept Merge Request #1056: (release/release_1.2 -> master)

Merge Request: 1、优化功能刀具清单查询接口，新增功能刀具查询接口。

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1056?initial=true

sf_manufacturing/models/mrp_production.py

@@ -5,7 +5,7 @@ import re
 import requests
 from itertools import groupby
 from odoo import api, fields, models, _
-from odoo.exceptions import UserError
+from odoo.exceptions import UserError,ValidationError
 from odoo.addons.sf_base.commons.common import Common
 from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
 
@@ -483,10 +483,49 @@ class MrpProduction(models.Model):
 
     def _reset_work_order_sequence(self):
         for rec in self:
-            current_sequence = 1
+            sequence_list = {}
+            model_type_id = rec.product_id.product_model_type_id
+            if model_type_id:
+                tmpl_num = 1
+                # 成品工序
+                product_routing_tmpl_ids = model_type_id.product_routing_tmpl_ids
+                if product_routing_tmpl_ids:
+                    for tmpl_id in product_routing_tmpl_ids:
+                        sequence_list.update({tmpl_id.route_workcenter_id.name: tmpl_num})
+                        tmpl_num += 1
+                # 表面工艺工序
+                # 模型类型的表面工艺工序模版
+                surface_tmpl_ids = model_type_id.surface_technics_routing_tmpl_ids
+                # 产品选择的表面工艺
+                model_process_parameters_ids = rec.product_id.model_process_parameters_ids
+                process_dict = {}
+                if model_process_parameters_ids:
+                    for process_parameters_id in model_process_parameters_ids:
+                        process_id = process_parameters_id.process_id
+                        for surface_tmpl_id in surface_tmpl_ids:
+                            if process_id == surface_tmpl_id.route_workcenter_id.surface_technics_id:
+                                surface_tmpl_name = surface_tmpl_id.route_workcenter_id.name
+                                process_dict.update({int(process_id.category_id.code): '%s-%s' % (
+                                    surface_tmpl_name, process_parameters_id.name)})
+                process_list = sorted(process_dict.keys())
+                for process_num in process_list:
+                    sequence_list.update({process_dict.get(process_num): tmpl_num})
+                    tmpl_num += 1
+                # 坯料工序
+                tmpl_num = 1
+                embryo_routing_tmpl_ids = model_type_id.embryo_routing_tmpl_ids
+                if embryo_routing_tmpl_ids:
+                    for tmpl_id in embryo_routing_tmpl_ids:
+                        sequence_list.update({tmpl_id.route_workcenter_id.name: tmpl_num})
+                        tmpl_num += 1
+            else:
+                raise ValidationError('该产品没有选择【模版类型】!')
+
             for work in rec.workorder_ids:
-                work.sequence = current_sequence
-                current_sequence += 1
+                if sequence_list.get(work.name):
+                    work.sequence = sequence_list[work.name]
+                else:
+                    raise ValidationError('工序【%s】在产品选择的模版类型中不存在!' % work.name)
                 # if work.name == '获取CNC加工程序':
                 #     work.button_start()
                 #     #work.fetchCNC()

sf_tool_management/controllers/controllers.py

@@ -8,31 +8,62 @@ from odoo.http import request
 
 class Manufacturing_Connect(http.Controller):
 
-    @http.route('/AutoDeviceApi/ToolGroup', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/ToolInventory', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
-    def get_functional_tool_groups_Info(self, **kw):
+    def get_functional_tool_inventory_Info(self, **kw):
         """
-        刀具组接口
+        功能刀具清单接口
         :param kw:
         :return:
         """
-        logging.info('get_functional_tool_groups_Info:%s' % kw)
+        logging.info('get_functional_tool_inventory_Info:%s' % kw)
         try:
             datas = request.httprequest.data
             ret = json.loads(datas)
             # ret = json.loads(ret['result'])
             logging.info('DeviceId:%s' % ret)
-            functional_tools = request.env['sf.tool.inventory'].sudo().search([])
+            tool_inventory = request.env['sf.tool.inventory'].sudo().search([])
+
+            res = {'Succeed': True, 'Datas': []}
+            if tool_inventory:
+                for item in tool_inventory:
+                    res['Datas'].append({
+                        'ToolName': item.name,
+                        'GroupName': item.tool_groups_id.name,
+                        'Lifetime': item.life_span
+                    })
+        except Exception as e:
+            res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
+            logging.info('get_functional_tool_inventory_Info error:%s' % e)
+        return json.JSONEncoder().encode(res)
+
+    @http.route('/AutoDeviceApi/ToolEntity', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+                cors="*")
+    def get_functional_tool_entity_Info(self, **kw):
+        """
+        功能刀具列表接口
+        :param kw:
+        :return:
+        """
+        logging.info('get_functional_tool_entity_Info:%s' % kw)
+        try:
+            datas = request.httprequest.data
+            ret = json.loads(datas)
+            # ret = json.loads(ret['result'])
+            logging.info('DeviceId:%s' % ret)
+            functional_tools = request.env['sf.functional.cutting.tool.entity'].sudo().search([])
 
             res = {'Succeed': True, 'Datas': []}
             if functional_tools:
                 for item in functional_tools:
                     res['Datas'].append({
+                        'Rfid': item.rfid,
+                        'ToolName': item.tool_name_id.name,
                         'GroupName': item.tool_groups_id.name,
-                        'ToolId': item.functional_cutting_tool_model_id.name,
-                        'ToolName': item.name
+                        'MaxLifetime': item.max_lifetime_value,
+                        'KnifeHandle': item.cutting_tool_cutterhandle_model_id.name
                     })
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
-            logging.info('get_functional_tool_groups_Info error:%s' % e)
+            logging.info('get_functional_tool_entity_Info error:%s' % e)
         return json.JSONEncoder().encode(res)