1、优化中控接口14-16

sf_tool_management/models/maintenance_equipment.py

@@ -1,5 +1,6 @@
 import json
 import requests
+import logging
 from odoo import models, api, fields
 from odoo.exceptions import ValidationError
 from odoo.addons.sf_base.commons.common import Common
@@ -21,6 +22,10 @@ class SfMaintenanceEquipmentTool(models.Model):
     used_value = fields.Integer('已使用值(min)', related='functional_tool_name_id.used_value')
     tool_install_time = fields.Datetime('机内装刀时间')
 
+    # def write_tool(self, datas):
+    #     if datas:
+    #         print(datas)
+
     @api.model_create_multi
     def create(self, vals_list):
         tools = super().create(vals_list)
@@ -38,23 +43,52 @@ class SfMaintenanceEquipment(models.Model):
 
     # ==========机床当前刀库实时信息接口==========
     def register_equipment_tool(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strurl = "https://x24467i973.zicp.fun/AutoDeviceApi/GetToolInfos"
-        val = {
-            "DeviceId": self.name
-        }
-        kw = json.dumps(val, ensure_ascii=False)
-        r = requests.get(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers)
+        # sf_sync_config = self.env['res.config.settings'].get_values()
+        # token = sf_sync_config['token']
+        # sf_secret_key = sf_sync_config['sf_secret_key']
+        # headers = Common.get_headers(self, token, sf_secret_key)
+        headers = {'Authorization': 'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A'}
+        crea_url = "https://x24467i973.zicp.fun/AutoDeviceApi/GetToolInfos"
+        params = {"DeviceId": self.name}
+        r = requests.get(crea_url, params=params, headers=headers)
         ret = r.json()
-        print(ret)
-        if r == 200:
+        logging.info('register_equipment_tool:%s' % ret)
+        datas = ret['Datas']
+        self.write_maintenance_equipment_tool(datas)
+        if ret['Succeed']:
             return "机床当前刀库实时信息指令发送成功"
         else:
             raise ValidationError("机床当前刀库实时信息指令发送失败")
 
+    def write_maintenance_equipment_tool(self, datas):
+        if datas:
+            for data in datas:
+                maintenance_equipment_id = self.search([('name', '=', data['DeviceId'])])
+                if maintenance_equipment_id:
+                    equipment_tool_id = self.env['maintenance.equipment.tool'].sudo().search(
+                        [('equipment_id', '=', maintenance_equipment_id.id), ('code', '=', data['ToolId'])])
+                    functional_tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
+                        [('rfid', '=', data['RfidCode'])])
+                    time = None
+                    if data['AddDatetime']:
+                        datatime = str(data['AddDatetime'])
+                        time = fields.Datetime.from_string(datatime[0:10] + ' ' + datatime[11:19])
+                    if equipment_tool_id and functional_tool_id:
+                        tool_install_time = {'Nomal': '正常', 'Warning': '报警'}
+                        equipment_tool_id.write({
+                            'functional_tool_name_id': functional_tool_id.id,
+                            'tool_install_time': time
+                        })
+                        functional_tool_id.write({
+                            'max_lifetime_value': data['MaxLife'],
+                            'used_value': data['UseLife'],
+                            'functional_tool_status': tool_install_time.get(data['State'])
+                        })
+                else:
+                    raise ValidationError('获取的【%s】设备不存在！！！' % data['DeviceId'])
+        else:
+            raise ValidationError('没有获取到刀具库信息！！！')
+
 
 class StockLot(models.Model):
     _inherit = 'stock.lot'