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

1、优化刀具预调仪接口及其写入到弹窗的流程，更改刀具总长度(高度)、直径和R角字段的精确度为小数点后三位；

Browse Source
This commit is contained in:
yuxianghui
2024-05-22 15:04:37 +08:00
parent d22f08d187
commit 4f6e4a8ed3
4 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sf_tool_management/controllers/controllers.py
View File

@@ -37,7 +37,7 @@ class Manufacturing_Connect(http.Controller):
logging.info('get_functional_tool_groups_Info error:%s' % e)
return json.JSONEncoder().encode(res)
@http.route('/AutoDeviceApi/PutToolParameter', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
@http.route('/AutoDeviceApi/PutToolParameter', type='http', auth='none', methods=['GET', 'POST'], csrf=False,
cors="*")
def put_tool_preset_parameter_port(self, **kw):
"""
@@ -49,20 +49,21 @@ class Manufacturing_Connect(http.Controller):
res = {'Succeed': True, 'Datas': []}
try:
datas = request.httprequest.data
ret = json.loads(datas)
tool_assembly = request.env['sf.functional.tool.assembly'].sudo().search([('start_preset_bool', '=', True)])
tool_assembly_order = request.env['sf.functional.tool.assembly.order'].sudo().search([])
ret = str(datas, 'utf-8')
data_lists = ret.split(",")
data_list = [data.replace('+', '') for data in data_lists]
logging.info(data_list)
tool_assembly = request.env['sf.functional.tool.assembly'].sudo().search(
[('assembly_order_code', '=', data_list[0])])
if not tool_assembly:
return json.JSONEncoder().encode(
{'Succeed': False, 'ErrorCode': 201, 'Error': '没有找到正在组装的组装单！'})
{'Succeed': False, 'ErrorCode': 201, 'Error': '没有找到组装单！'})
tool_assembly.write({
'after_assembly_tool_loading_length': ret['loading_length'],
'after_assembly_functional_tool_length': ret['functional_tool_length'],
'after_assembly_max_lifetime_value': ret['max_lifetime_value'],
'after_assembly_alarm_value': 100,
'after_assembly_effective_length': 100
'after_assembly_tool_loading_length': float(data_list[1]), # 高度(总长度)
'after_assembly_functional_tool_diameter': float(data_list[2] or "0"), # 直径
'after_assembly_knife_tip_r_angle': float(data_list[3] or "0") # R角
})
except Exception as e:
res = {'Succeed': False, 'ErrorCode': 202, 'Error': '缺少%s字段信息' % e}
res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
logging.info('put_tool_preset_parameter_port error:%s' % e)
return json.JSONEncoder().encode(res)