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)

28
sf_tool_management/models/base.py
View File

@@ -543,8 +543,8 @@ class FunctionalToolAssembly(models.Model):
after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True)
after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
string='组装后功能刀具类型', readonly=True)
after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', readonly=True)
after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', readonly=True)
after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', readonly=True, digits=(10, 3))
after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', readonly=True, digits=(10, 3))
after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', readonly=True)
cut_time = fields.Integer(string='已切削时间(min)', readonly=True)
cut_length = fields.Float(string='已切削长度(mm)', readonly=True)
@@ -556,7 +556,7 @@ class FunctionalToolAssembly(models.Model):
after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', readonly=True)
after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)', readonly=True)
after_assembly_used_value = fields.Integer(string='组装后已使用值(min)', readonly=True)
after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', readonly=True)
after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', readonly=True, digits=(10, 3))
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True)
after_assembly_effective_length = fields.Float(string='组装后有效长(mm)', readonly=True)
L_D_number = fields.Float(string='L/D值(mm)', readonly=True)
@@ -610,24 +610,24 @@ class FunctionalToolAssembly(models.Model):
自动生成组装单编码
"""
new_time = str(fields.Date.today())
datetime = new_time[2:4] + new_time[5:7] + new_time[-2:]
datetime = new_time[2:4] + new_time[5:7]
if loading_task_source == '0':
code = 'C' + datetime
elif loading_task_source == '1':
code = 'J' + datetime
elif loading_task_source == '2':
code = 'K' + datetime
else:
code = False
functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().search(
[('loading_task_source', '=', loading_task_source),
('assembly_order_code', 'ilike', datetime)], limit=1, order="id desc")
('assembly_order_code', 'ilike', code)], limit=1, order="id desc")
if not functional_tool_assembly:
num = "%03d" % 1
else:
m = int(functional_tool_assembly.assembly_order_code[-3:]) + 1
num = "%03d" % m
if loading_task_source == '0':
code = 'CAMZZD' + datetime + str(num)
elif loading_task_source == '1':
code = 'JTZZD' + datetime + str(num)
elif loading_task_source == '2':
code = 'MTSZZD' + datetime + str(num)
else:
code = False
return code
return code + str(num)
def get_functional_tool(self, val):
functional_tools = self.env['sf.functional.tool.assembly'].search(

2
sf_tool_management/views/tool_base_views.xml
View File

@@ -491,7 +491,7 @@
</group>
</group>
<notebook>
<page string="组装信息" attrs="{'invisible': [('assemble_status', '=' ,'0')]}">
<page string="组装信息">
<group col="1">
<group col="1">
<group>

9
sf_tool_management/wizard/wizard.py
View File

@@ -463,8 +463,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', compute='_compute_name', store=True)
after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
string='组装后功能刀具类型')
after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)')
after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)')
after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', digits=(10, 3))
after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', digits=(10, 3))
after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', default='0')
cut_time = fields.Integer(string='已切削时间(min)')
cut_length = fields.Float(string='已切削长度(mm)')
@@ -476,7 +476,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)')
after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)')
after_assembly_used_value = fields.Integer(string='组装后已使用值(min)')
after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)')
after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', digits=(10, 3))
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', required=True)
after_assembly_effective_length = fields.Float(string='组装后有效长(mm)')
L_D_number = fields.Float(string='L/D值(mm)', compute='_compute_l_d_number')
@@ -491,7 +491,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
self.write({
'after_assembly_tool_loading_length': tool.after_assembly_tool_loading_length, # 总长度
'after_assembly_functional_tool_length': tool.after_assembly_functional_tool_length # 伸出长
'after_assembly_functional_tool_diameter': tool.after_assembly_functional_tool_diameter, # 直径
'after_assembly_knife_tip_r_angle': tool.after_assembly_knife_tip_r_angle # R角
})
return {