jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化刀具组接口

Browse Source
This commit is contained in:
yuxianghui
2024-02-20 14:32:13 +08:00
parent 9ede024710
commit 53e5aa2017
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sf_base/models/tool_base_new.py
View File

@@ -263,11 +263,14 @@ class ToolGroups(models.Model):
headers = Common.get_headers(obj, token, sf_secret_key) headers = Common.get_headers(obj, token, sf_secret_key)
strurl = sf_sync_config['sf_url'] + create_url strurl = sf_sync_config['sf_url'] + create_url
device_id = '' device_id = ''
for equipment_id in obj.equipment_ids: name = None
device_id = '%s,%s' % (device_id, equipment_id.name) if obj:
for equipment_id in obj.equipment_ids:
device_id = '%s,%s' % (device_id, equipment_id.name)
name = obj.name
val = { val = {
'DeviceId': device_id, 'DeviceId': device_id,
'GroupName': obj.name, 'GroupName': name,
} }
kw = json.dumps(val, ensure_ascii=False) kw = json.dumps(val, ensure_ascii=False)
r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers) r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers)
@@ -279,7 +282,7 @@ class ToolGroups(models.Model):
# def write(self, vals): # def write(self, vals):
# obj = super().write(vals) # obj = super().write(vals)
# self._register_tool_groups(obj) # self._register_tool_groups(self)
# return obj # return obj
# #
# @api.model_create_multi # @api.model_create_multi

3
sf_tool_management/controllers/controllers.py
View File

@@ -12,7 +12,7 @@ class Manufacturing_Connect(http.Controller):
cors="*") cors="*")
def get_equipment_tool_Info(self, **kw): def get_equipment_tool_Info(self, **kw):
""" """
机床当前刀库实时信息 机床刀库实时信息
:param kw: :param kw:
:return: :return:
""" """
@@ -31,6 +31,7 @@ class Manufacturing_Connect(http.Controller):
for equipment_tool_id in item.product_template_ids: for equipment_tool_id in item.product_template_ids:
functional_tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search( functional_tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
[('code', '=', equipment_tool_id.tool_code)]) [('code', '=', equipment_tool_id.tool_code)])
alarm_time = None alarm_time = None
if functional_tool_id.functional_tool_status == '报警': if functional_tool_id.functional_tool_status == '报警':
alarm_time = self.env['sf.functional.tool.warning'].sudo().search( alarm_time = self.env['sf.functional.tool.warning'].sudo().search(