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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化返工和重新制造订单

Browse Source
This commit is contained in:
jinling.yang
2024-05-23 11:46:26 +08:00
parent 5f42b5d056 c698b50853
commit 3a0db05c33
9 changed files with 166 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_tool_management/controllers/controllers.py
View File

@@ -54,12 +54,12 @@ class Manufacturing_Connect(http.Controller):
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])])
[('assembly_order_code', '=', data_list[0]), ('start_preset_bool', '=', True)])
if not tool_assembly:
return json.JSONEncoder().encode(
{'Succeed': False, 'ErrorCode': 201, 'Error': '没有找到组装单！'})
{'Succeed': False, 'ErrorCode': 201, 'code': data_list[0], 'Error': '没有找到正在组装的组装单！'})
tool_assembly.write({
'after_assembly_tool_loading_length': float(data_list[1]), # 高度(总长度)
'after_assembly_tool_loading_length': float(data_list[1] or "0"), # 高度(总长度)
'after_assembly_functional_tool_diameter': float(data_list[2] or "0"), # 直径
'after_assembly_knife_tip_r_angle': float(data_list[3] or "0") # R角
})

1
sf_tool_management/models/__init__.py
View File

@@ -6,4 +6,5 @@ from . import mrp_workorder
from . import functional_tool_enroll
from . import fixture_material_search
from . import fixture_enroll
from . import temporary_data_processing_methods

13
sf_tool_management/models/base.py
View File

@@ -557,7 +557,8 @@ class FunctionalToolAssembly(models.Model):
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, digits=(10, 3))
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True)
after_assembly_handle_length = fields.Float(string='组装后刀柄长度(mm)',readonly=True, digits=(10, 3))
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True, digits=(10, 3))
after_assembly_effective_length = fields.Float(string='组装后有效长(mm)', readonly=True)
L_D_number = fields.Float(string='L/D值(mm)', readonly=True)
hiding_length = fields.Float(string='避空长(mm)', readonly=True)
@@ -586,12 +587,12 @@ class FunctionalToolAssembly(models.Model):
'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_production_line_name_id': self.production_line_name_id.id,
'default_machine_tool_name_id': self.machine_tool_name_id.id,
'default_cutter_spacing_code_id': self.cutter_spacing_code_id.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_type_id': self.functional_tool_type_id.id,
'default_tool_groups_id': self.tool_groups_id.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,

16
sf_tool_management/models/functional_tool.py
View File

@@ -25,12 +25,13 @@ class FunctionalCuttingToolEntity(models.Model):
sf_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型',
group_expand='_read_group_mrs_cutting_tool_type_id', compute_sudo=True)
functional_tool_diameter = fields.Float(string='刀具直径(mm)', readonly=True)
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True)
functional_tool_diameter = fields.Float(string='刀具直径(mm)', readonly=True, digits=(10, 3))
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True, digits=(10, 3))
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
tool_loading_length = fields.Float(string='总长度(mm)', readonly=True)
functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True)
tool_loading_length = fields.Float(string='总长度(mm)', readonly=True, digits=(10, 3))
handle_length = fields.Float(string='刀柄长度(mm)',readonly=True, digits=(10, 3))
functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True, digits=(10, 3))
effective_length = fields.Float(string='有效长(mm)', readonly=True)
tool_room_num = fields.Integer(string='刀具房数量', readonly=True)
line_edge_knife_library_num = fields.Integer(string='线边刀库数量', readonly=True)
@@ -51,13 +52,6 @@ class FunctionalCuttingToolEntity(models.Model):
safe_inventory_id = fields.Many2one('sf.real.time.distribution.of.functional.tools',
string='功能刀具安全库存', readonly=True)
def button_safe_inventory_id(self):
"""更新功能刀具关联的安全库存记录"""
tool_is = self.search([])
for item in tool_is:
item.safe_inventory_id = self.env['sf.real.time.distribution.of.functional.tools'].search(
[('functional_name_id', '=', item.tool_name_id.id)])[0]
@api.depends('barcode_id.quant_ids', 'functional_tool_status')
def _compute_current_location_id(self):
for record in self:

38
sf_tool_management/models/temporary_data_processing_methods.py Normal file
View File

@@ -0,0 +1,38 @@
from odoo import fields, models, api
class FunctionalCuttingToolEntity(models.Model):
_inherit = 'sf.functional.cutting.tool.entity'
def button_safe_inventory_id(self):
"""更新功能刀具关联的安全库存记录"""
tool_is = self.search([])
for item in tool_is:
item.safe_inventory_id = self.env['sf.real.time.distribution.of.functional.tools'].search(
[('functional_name_id', '=', item.tool_name_id.id)])[0]
class FunctionalToolAssembly(models.Model):
_inherit = 'sf.functional.tool.assembly'
def put_assembly_order_code(self):
assembly_list = self.search([('assemble_status', '=', '0')], order="id asc")
for item in assembly_list:
code = item.assembly_order_code[-9:-5]
if item.loading_task_source == '0':
code = 'C' + code
elif item.loading_task_source == '1':
code = 'J' + code
elif item.loading_task_source == '2':
code = 'K' + code
functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().search(
[('loading_task_source', '=', item.loading_task_source),
('assembly_order_code', 'ilike', code)], limit=1, order="id desc")
if not functional_tool_assembly:
num = "%04d" % 1
else:
m = int(functional_tool_assembly.assembly_order_code[-3:]) + 1
num = "%04d" % m
item.assembly_order_code = "%s%s" % (code, num)

19
sf_tool_management/views/functional_tool_views.xml
View File

@@ -155,24 +155,25 @@
<group>
<field name="functional_tool_diameter"/>
<field name="knife_tip_r_angle"/>
<field name="whether_standard_knife"/>
<field name="coarse_middle_thin"/>
<field name="tool_loading_length"/>
<field name="handle_length"/>
<field name="functional_tool_length"/>
<field name="max_lifetime_value"/>
<field name="alarm_value"/>
<field name="used_value"/>
<field name="used_value" invisible="1"/>
<field name="current_location_id" invisible="1"/>
<field name="current_location"/>
</group>
<group>
<field name="tool_loading_length"/>
<field name="functional_tool_length"/>
<field name="effective_length"/>
<field name="L_D_number"/>
<field name="hiding_length"/>
<field name="whether_standard_knife"/>
<field name="coarse_middle_thin"/>
<field name="effective_length" invisible="1"/>
<field name="L_D_number" invisible="1"/>
<field name="hiding_length" invisible="1"/>
<field name="new_former"/>
<field name="cut_time" attrs="{'invisible': [('new_former','=','0')]}"/>
<field name="cut_length" attrs="{'invisible': [('new_former','=','0')]}"/>
<field name="cut_number" attrs="{'invisible': [('new_former','=','0')]}"/>
<field name="current_location" string="当前位置"/>
</group>
</group>
</page>

35
sf_tool_management/views/tool_base_views.xml
View File

@@ -452,8 +452,8 @@
<field name="reason_for_applying" invisible="True"/>
<field name="functional_tool_type_id" invisible="True"/>
<button string="组装" name="put_start_preset" type="object"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
</tree>
</field>
</record>
@@ -464,6 +464,8 @@
<field name="arch" type="xml">
<form create="0" delete="0" edit="0">
<header>
<button string="修改编码" name="put_assembly_order_code" type="object"
class="btn-primary" confirm="是否确认修改编码"/>
<button string="组装" name="put_start_preset" type="object"
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
@@ -491,7 +493,7 @@
</group>
</group>
<notebook>
<page string="组装信息">
<page string="组装信息" attrs="{'invisible': [('assemble_status', '=', '0')]}">
<group col="1">
<group col="1">
<group>
@@ -504,9 +506,9 @@
<field name="after_assembly_functional_tool_type_id"
string="功能刀具类型"/>
<field name="tool_groups_id"/>
<field name="after_assembly_functional_tool_diameter"
string="刀具直径(mm)"/>
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"/>
<field name="after_assembly_whether_standard_knife"
string="是否标准刀"/>
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
<field name="after_assembly_new_former" string="新/旧"/>
<field name="cut_time"
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
@@ -516,19 +518,20 @@
attrs="{'invisible': [('after_assembly_new_former', '=', '0')]}"/>
</group>
<group>
<field name="after_assembly_whether_standard_knife"
string="是否标准刀"/>
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
<field name="after_assembly_functional_tool_diameter"
string="刀具直径(mm)"/>
<field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"/>
<field name="after_assembly_tool_loading_length" string="总长度(mm)"/>
<field name="after_assembly_handle_length" string="刀柄长度(mm)"/>
<field name="after_assembly_functional_tool_length"
string="伸出长(mm)"/>
<field name="after_assembly_max_lifetime_value"
string="最大寿命值(min)"/>
<field name="after_assembly_alarm_value" string="报警值(min)"/>
<field name="after_assembly_used_value" string="已使用值(min)"/>
<field name="after_assembly_tool_loading_length" string="总长度(mm)"/>
<field name="after_assembly_functional_tool_length"
string="伸出长(mm)"/>
<field name="after_assembly_effective_length" string="有效长(mm)"/>
<field name="L_D_number"/>
<field name="hiding_length"/>
<field name="after_assembly_used_value" string="已使用值(min)" invisible="1"/>
<field name="after_assembly_effective_length" string="有效长(mm)" invisible="1"/>
<field name="L_D_number" invisible="1"/>
<field name="hiding_length" invisible="1"/>
</group>
</group>
</group>

33
sf_tool_management/wizard/wizard.py
View File

@@ -473,16 +473,29 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
after_assembly_whether_standard_knife = fields.Boolean(string='组装后是否标准刀', default=True)
after_assembly_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
string='组装后粗/中/精', default='3')
after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)')
after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', readonly=True)
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)', digits=(10, 3))
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', required=True)
after_assembly_handle_length = fields.Float(string='组装后刀柄长度(mm)', digits=(10, 3))
after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', digits=(10, 3),
compute='_compute_after_assembly_functional_tool_length')
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='组装后刀具组')
@api.depends('after_assembly_tool_loading_length', 'after_assembly_handle_length')
def _compute_after_assembly_functional_tool_length(self):
for item in self:
item.after_assembly_functional_tool_length = item.after_assembly_tool_loading_length - item.after_assembly_handle_length
@api.onchange('after_assembly_max_lifetime_value')
def _onchange_after_assembly_alarm_value(self):
for item in self:
if item.after_assembly_max_lifetime_value:
item.after_assembly_alarm_value = item.after_assembly_max_lifetime_value * 0.95
def get_tool_preset_parameter(self):
"""
获取刀具预调仪数据
@@ -681,12 +694,14 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
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！！！')
# 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:
raise ValidationError('组装参数信息【刀具直径】不能为0！！！')
if self.after_assembly_handle_length == 0:
raise ValidationError('组装参数信息【刀柄长度】不能为0！！！')
def get_desc_1(self, stock_lot):
return {
@@ -716,6 +731,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
'after_assembly_alarm_value': self.after_assembly_alarm_value,
'after_assembly_used_value': self.after_assembly_used_value,
'after_assembly_tool_loading_length': self.after_assembly_tool_loading_length,
'after_assembly_handle_length': self.after_assembly_handle_length,
'after_assembly_functional_tool_length': self.after_assembly_functional_tool_length,
'after_assembly_effective_length': self.after_assembly_effective_length,
'L_D_number': self.L_D_number,
@@ -748,6 +764,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
'coarse_middle_thin': self.after_assembly_coarse_middle_thin,
'new_former': self.after_assembly_new_former,
'tool_loading_length': self.after_assembly_tool_loading_length,
'handle_length': self.after_assembly_handle_length,
'functional_tool_length': self.after_assembly_functional_tool_length,
'effective_length': self.after_assembly_effective_length,

116
sf_tool_management/wizard/wizard_view.xml
View File

@@ -178,24 +178,26 @@
<field name="image" nolabel="1" widget="image"/>
</group>
</group>
<group string="功能刀具申请信息">
<group string="功能刀具申请信息" col="1">
<group>
<field name="functional_tool_name"/>
<field name="functional_tool_type_id"/>
<field name="tool_groups_id"/>
<field name="functional_tool_diameter" string="刀具直径(mm)"/>
<field name="knife_tip_r_angle"/>
<field name="tool_loading_length"/>
<field name="functional_tool_length"/>
<field name="effective_length"/>
</group>
<group>
<field name="whether_standard_knife"/>
<field name="coarse_middle_thin"/>
<field name="new_former"/>
<field name="use_tool_time"/>
<field name="reason_for_applying"/>
<!-- <field name="functional_tool_cutting_type"/>-->
<group>
<field name="functional_tool_name"/>
<field name="functional_tool_type_id"/>
<field name="tool_groups_id"/>
<field name="functional_tool_diameter" string="刀具直径(mm)"/>
<field name="knife_tip_r_angle"/>
<field name="tool_loading_length"/>
<field name="functional_tool_length"/>
<field name="effective_length"/>
</group>
<group>
<field name="whether_standard_knife"/>
<field name="coarse_middle_thin"/>
<field name="new_former"/>
<field name="use_tool_time"/>
<field name="reason_for_applying"/>
<!-- <field name="functional_tool_cutting_type"/>-->
</group>
</group>
</group>
<group string="组装物料信息" col="1">
@@ -336,49 +338,47 @@
</div>
<group>
<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_whether_standard_knife" string="是否标准刀"/>
<field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
<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>
<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_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_tool_loading_length" string="总长度(mm)"
class="custom_required"/>
<field name="after_assembly_handle_length" string="刀柄长度(mm)"
class="custom_required"/>
<field name="after_assembly_functional_tool_length" string="伸出长(mm)"
class="custom_required"/>
<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)" invisible="1"/>
<field name="after_assembly_effective_length" string="有效长(mm)" invisible="1"
class="custom_required"/>
<field name="hiding_length" class="custom_required" invisible="1"/>
<field name="L_D_number" invisible="1"/>
</group>
</group>
</group>