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

Accept Merge Request #1040: (feature/刀具预调仪接口优化 -> develop)

Browse Source 
Merge Request: 新增刀具预调仪接口，优化组装按键

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1040?initial=true
This commit is contained in:
禹翔辉
2024-05-22 15:09:22 +08:00
committed by Coding
parent b524e385a1 8d02a94f78
commit b0b3ce7d99
5 changed files with 171 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sf_tool_management/controllers/controllers.py
View File

@@ -36,3 +36,34 @@ class Manufacturing_Connect(http.Controller):
res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
logging.info('get_functional_tool_groups_Info error:%s' % e)
return json.JSONEncoder().encode(res)
@http.route('/AutoDeviceApi/PutToolParameter', type='http', auth='none', methods=['GET', 'POST'], csrf=False,
cors="*")
def put_tool_preset_parameter_port(self, **kw):
"""
刀具预调仪接口
:param kw:
:return:
"""
logging.info('put_tool_preset_parameter_port:%s' % kw)
res = {'Succeed': True, 'Datas': []}
try:
datas = request.httprequest.data
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': '没有找到组装单！'})
tool_assembly.write({
'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': e}
logging.info('put_tool_preset_parameter_port error:%s' % e)
return json.JSONEncoder().encode(res)

59
sf_tool_management/models/base.py
View File

@@ -538,12 +538,13 @@ class FunctionalToolAssembly(models.Model):
chuck_name = fields.Char('')
# ==============================================
# 组装功能刀具参数信息
start_preset_bool = fields.Boolean('开始预调', default=False)
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
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)
@@ -555,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)
@@ -574,29 +575,59 @@ class FunctionalToolAssembly(models.Model):
active = fields.Boolean(string='已归档', default=True)
def put_start_preset(self):
self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False})
self.write({'start_preset_bool': True})
return {
'type': 'ir.actions.act_window',
'res_model': 'sf.functional.tool.assembly.order',
'name': '功能刀具组装单',
'view_mode': 'form',
'target': 'new',
'context': {'default_name': self.name,
'default_assembly_order_code': self.assembly_order_code,
'default_production_line_name_id': self.production_line_name_id,
'default_machine_tool_name_id': self.machine_tool_name_id,
'default_cutter_spacing_code_id': self.cutter_spacing_code_id,
'default_functional_tool_name': self.functional_tool_name,
'default_functional_tool_type_id': self.functional_tool_type_id,
'default_tool_groups_id': self.tool_groups_id,
'default_functional_tool_diameter': self.functional_tool_diameter,
'default_knife_tip_r_angle': self.knife_tip_r_angle,
'default_tool_loading_length': self.tool_loading_length,
'default_functional_tool_length': self.functional_tool_length,
'default_effective_length': self.effective_length,
'default_whether_standard_knife': self.whether_standard_knife,
'default_coarse_middle_thin': self.coarse_middle_thin,
'default_new_former': self.new_former,
'default_use_tool_time': self.use_tool_time,
'default_reason_for_applying': self.reason_for_applying
}
}
def _get_code(self, loading_task_source):
"""
自动生成组装单编码
"""
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(

63
sf_tool_management/views/tool_base_views.xml
View File

@@ -451,36 +451,9 @@
<field name="whether_standard_knife" invisible="True"/>
<field name="reason_for_applying" invisible="True"/>
<field name="functional_tool_type_id" invisible="True"/>
<!-- <field name="functional_tool_cutting_type" invisible="True"/>-->
<button string="组装"
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
type="action"
context="{'default_name':name,
'default_assembly_order_code':assembly_order_code,
'default_production_line_name_id':production_line_name_id,
'default_machine_tool_name_id':machine_tool_name_id,
'default_cutter_spacing_code_id':cutter_spacing_code_id,
'default_functional_tool_name':functional_tool_name,
'default_functional_tool_type_id':functional_tool_type_id,
'default_tool_groups_id': tool_groups_id,
'default_functional_tool_diameter':functional_tool_diameter,
'default_knife_tip_r_angle':knife_tip_r_angle,
'default_tool_loading_length':tool_loading_length,
'default_functional_tool_length':functional_tool_length,
'default_effective_length':effective_length,
'default_whether_standard_knife':whether_standard_knife,
'default_coarse_middle_thin':coarse_middle_thin,
'default_new_former':new_former,
'default_use_tool_time':use_tool_time,
'default_reason_for_applying':reason_for_applying,
}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}" groups="sf_base.group_sf_mrp_user"
class="btn-primary"/>
<!-- <button string="组装单打印" name="assemble_single_print" type="object"-->
<!-- groups="sf_base.group_sf_mrp_user"-->
<!-- attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
<!-- confirm="是否确认打印组装单"/>-->
<button string="组装" name="put_start_preset" type="object"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
</tree>
</field>
</record>
@@ -491,35 +464,9 @@
<field name="arch" type="xml">
<form create="0" delete="0" edit="0">
<header>
<button string="组装"
name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
type="action" groups="sf_base.group_sf_mrp_user"
context="{'default_name':name,
'default_assembly_order_code':assembly_order_code,
'default_production_line_name_id':production_line_name_id,
'default_machine_tool_name_id':machine_tool_name_id,
'default_cutter_spacing_code_id':cutter_spacing_code_id,
'default_functional_tool_name':functional_tool_name,
'default_functional_tool_type_id':functional_tool_type_id,
'default_tool_groups_id': tool_groups_id,
'default_functional_tool_diameter':functional_tool_diameter,
'default_knife_tip_r_angle':knife_tip_r_angle,
'default_tool_loading_length':tool_loading_length,
'default_functional_tool_length':functional_tool_length,
'default_effective_length':effective_length,
'default_whether_standard_knife':whether_standard_knife,
'default_coarse_middle_thin':coarse_middle_thin,
'default_new_former':new_former,
'default_use_tool_time':use_tool_time,
'default_reason_for_applying':reason_for_applying,
}"
<button string="组装" name="put_start_preset" type="object"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
<!-- <button string="组装单打印" name="assemble_single_print" type="object"-->
<!-- groups="sf_base.group_sf_mrp_user"-->
<!-- attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
<!-- confirm="是否确认打印组装单"/>-->
<field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/>
</header>
<sheet>
@@ -544,7 +491,7 @@
</group>
</group>
<notebook>
<page string="组装信息" attrs="{'invisible': [('assemble_status', '=' ,'0')]}">
<page string="组装信息">
<group col="1">
<group col="1">
<group>

69
sf_tool_management/wizard/wizard.py
View File

@@ -355,7 +355,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
# ================刀柄型号===============
handle_freight_rfid = fields.Char('刀柄Rfid', compute='_compute_rfid')
handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', required=True,
handle_code_id = fields.Many2one('stock.lot', '刀柄序列号',
domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄'),
('tool_material_status', '=', '可用')])
handle_product_id = fields.Many2one('product.product', string='刀柄名称', compute='_compute_handle_product_id',
@@ -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,13 +476,34 @@ 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')
hiding_length = fields.Float(string='避空长(mm)')
after_tool_groups_id = fields.Many2one('sf.tool.groups', string='组装后刀具组')
def get_tool_preset_parameter(self):
"""
获取刀具预调仪数据
"""
tool = self.env['sf.functional.tool.assembly'].search([('assembly_order_code', '=', self.assembly_order_code)])
self.write({
'after_assembly_tool_loading_length': tool.after_assembly_tool_loading_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 {
'type': 'ir.actions.act_window',
'res_model': 'sf.functional.tool.assembly.order',
'view_mode': 'form',
'res_id': self.id,
'target': 'new',
'flags': {'form': {'action_buttons': True, 'options': {'mode': 'modal'}}}
}
@api.onchange('after_name_id')
def _onchange_number(self):
for item in self:
@@ -574,24 +595,6 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
else:
record.L_D_number = 0
@api.constrains('after_assembly_tool_loading_length', 'after_assembly_functional_tool_length',
'after_assembly_max_lifetime_value', 'after_assembly_alarm_value',
'after_assembly_effective_length', 'hiding_length')
def _check_length_control(self):
for obj in self:
if obj.after_assembly_tool_loading_length == 0:
raise ValidationError('组装参数信息【总长度】不能为0！！！')
if obj.after_assembly_functional_tool_length == 0:
raise ValidationError('组装参数信息【伸出长】不能为0！！！')
if obj.after_assembly_max_lifetime_value == 0:
raise ValidationError('组装参数信息【最大寿命值】不能为0！！！')
if obj.after_assembly_alarm_value == 0:
raise ValidationError('组装参数信息【报警值】不能为0！！！')
if obj.after_assembly_effective_length == 0:
raise ValidationError('组装参数信息【有效长】不能为0！！！')
if obj.hiding_length == 0:
raise ValidationError('组装参数信息【避空长】不能为0！！！')
def functional_tool_assembly(self):
"""
功能刀具组装
@@ -659,16 +662,35 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
def materials_must_be_judged(self):
"""
功能刀具组装物料必填判断
功能刀具组装必填判断
"""
# 物料必填校验
if not self.handle_code_id:
raise ValidationError('缺少【刀柄】物料信息！')
if not self.integral_product_id and not self.blade_product_id:
raise ValidationError('【整体式刀具】和【刀片】必须填写一个！')
if self.blade_product_id:
if not self.bar_product_id and not self.pad_product_id:
raise ValidationError('【刀盘】和【刀杆】必须填写一个！')
# 组装参数必填校验
if self.after_assembly_tool_loading_length == 0:
raise ValidationError('组装参数信息【总长度】不能为0！！！')
if self.after_assembly_functional_tool_length == 0:
raise ValidationError('组装参数信息【伸出长】不能为0！！！')
if self.after_assembly_max_lifetime_value == 0:
raise ValidationError('组装参数信息【最大寿命值】不能为0！！！')
if self.after_assembly_alarm_value == 0:
raise ValidationError('组装参数信息【报警值】不能为0！！！')
if self.after_assembly_effective_length == 0:
raise ValidationError('组装参数信息【有效长】不能为0！！！')
if self.hiding_length == 0:
raise ValidationError('组装参数信息【避空长】不能为0！！！')
if self.after_assembly_functional_tool_diameter == 0 and self.after_assembly_knife_tip_r_angle == 0:
raise ValidationError('组装参数信息【刀具直径】和【刀具R角】必须有一个不能为0！！！')
def get_desc_1(self, stock_lot):
return {
'start_preset_bool': False,
'barcode_id': stock_lot.id,
'code': self.code,
'rfid': self.rfid,
@@ -918,7 +940,6 @@ class StockLot(models.Model):
})
return stock_move_id, stock_move_line_id
# class StockQuant(models.Model):
# _inherit = 'stock.quant'
#

82
sf_tool_management/wizard/wizard_view.xml
View File

@@ -330,47 +330,55 @@
</group>
</group>
<group string="组装参数信息">
<group string="组装参数信息" col="1">
<div>
<button name="get_tool_preset_parameter" string="刷新" type="object" class="btn-primary"/>
</div>
<group>
<group>
<field name="barcode_id" invisible="True"/>
<field name="code" readonly="True"/>
<field name="rfid" class="custom_required"/>
<field name="after_name_id" string="功能刀具名称" placeholder="请选择功能刀具名称"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="after_assembly_functional_tool_name" string="功能刀具名称" invisible="1"/>
<field name="after_assembly_functional_tool_type_id" string="功能刀具类型"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="after_tool_groups_id"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="after_assembly_functional_tool_diameter" string="刀具直径(mm)"
class="custom_required"/>
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"
class="custom_required"/>
<field name="after_assembly_new_former" string="新/旧"/>
<field name="cut_time" attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
<field name="cut_length"
attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
<field name="cut_number"
attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
<group>
<field name="barcode_id" invisible="True"/>
<field name="code" readonly="True"/>
<field name="rfid" class="custom_required"/>
<field name="after_name_id" string="功能刀具名称" placeholder="请选择功能刀具名称"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="after_assembly_functional_tool_name" string="功能刀具名称"
invisible="1"/>
<field name="after_assembly_functional_tool_type_id" string="功能刀具类型"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="after_tool_groups_id"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="after_assembly_functional_tool_diameter" string="刀具直径(mm)"
class="custom_required"/>
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"
class="custom_required"/>
<field name="after_assembly_new_former" string="新/旧"/>
<field name="cut_time"
attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
<field name="cut_length"
attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
<field name="cut_number"
attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
</group>
</group>
</group>
<group>
<group>
<field name="after_assembly_whether_standard_knife" string="是否标准刀"/>
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
<field name="after_assembly_max_lifetime_value" string="最大寿命值(min)"
class="custom_required"/>
<field name="after_assembly_alarm_value" string="报警值(min)" class="custom_required"/>
<field name="after_assembly_used_value" string="已使用值(min)"/>
<field name="after_assembly_tool_loading_length" string="总长度(mm)"
class="custom_required"/>
<field name="after_assembly_functional_tool_length" string="伸出长(mm)"
class="custom_required"/>
<field name="after_assembly_effective_length" string="有效长(mm)"
class="custom_required"/>
<field name="hiding_length" class="custom_required"/>
<field name="L_D_number"/>
<group>
<field name="after_assembly_whether_standard_knife" string="是否标准刀"/>
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
<field name="after_assembly_max_lifetime_value" string="最大寿命值(min)"
class="custom_required"/>
<field name="after_assembly_alarm_value" string="报警值(min)"
class="custom_required"/>
<field name="after_assembly_used_value" string="已使用值(min)"/>
<field name="after_assembly_tool_loading_length" string="总长度(mm)"
class="custom_required"/>
<field name="after_assembly_functional_tool_length" string="伸出长(mm)"
class="custom_required"/>
<field name="after_assembly_effective_length" string="有效长(mm)"
class="custom_required"/>
<field name="hiding_length" class="custom_required"/>
<field name="L_D_number"/>
</group>
</group>
</group>
</group>