From 53e5aa2017dd0a5fbc1c5bceffdd01c441e909c2 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Tue, 20 Feb 2024 14:32:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=80=E5=85=B7=E7=BB=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/tool_base_new.py | 11 +++++++---- sf_tool_management/controllers/controllers.py | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py index 8f3eb86f..6666132c 100644 --- a/sf_base/models/tool_base_new.py +++ b/sf_base/models/tool_base_new.py @@ -263,11 +263,14 @@ class ToolGroups(models.Model): headers = Common.get_headers(obj, token, sf_secret_key) strurl = sf_sync_config['sf_url'] + create_url device_id = '' - for equipment_id in obj.equipment_ids: - device_id = '%s,%s' % (device_id, equipment_id.name) + name = None + if obj: + for equipment_id in obj.equipment_ids: + device_id = '%s,%s' % (device_id, equipment_id.name) + name = obj.name val = { 'DeviceId': device_id, - 'GroupName': obj.name, + 'GroupName': name, } kw = json.dumps(val, ensure_ascii=False) r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers) @@ -279,7 +282,7 @@ class ToolGroups(models.Model): # def write(self, vals): # obj = super().write(vals) - # self._register_tool_groups(obj) + # self._register_tool_groups(self) # return obj # # @api.model_create_multi diff --git a/sf_tool_management/controllers/controllers.py b/sf_tool_management/controllers/controllers.py index 0e60a57f..becf79ec 100644 --- a/sf_tool_management/controllers/controllers.py +++ b/sf_tool_management/controllers/controllers.py @@ -12,7 +12,7 @@ class Manufacturing_Connect(http.Controller): cors="*") def get_equipment_tool_Info(self, **kw): """ - 机床当前刀库实时信息 + 机床刀库实时信息 :param kw: :return: """ @@ -31,6 +31,7 @@ class Manufacturing_Connect(http.Controller): for equipment_tool_id in item.product_template_ids: functional_tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search( [('code', '=', equipment_tool_id.tool_code)]) + alarm_time = None if functional_tool_id.functional_tool_status == '报警': alarm_time = self.env['sf.functional.tool.warning'].sudo().search(