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

Accept Merge Request #506: (feature/功能刀具组装优化 -> develop)

Browse Source 
Merge Request: 1、优化CAM申请的组装单中功能刀具名称没有内容的问题，优化组装单等的form表名称问题；2、去除组装单弹窗输出语句 

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/506?initial=true
This commit is contained in:
禹翔辉
2023-11-01 17:40:30 +08:00
committed by Coding
parent aa9464face ba19175472
commit 03efa01a85
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sf_tool_management/models/base.py
View File

@@ -14,7 +14,7 @@ class FunctionalCuttingToolEntity(models.Model):
# code = fields.Char('序列号')
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
name = fields.Char('名称', size=20)
name = fields.Char(related='barcode_id.name')
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号')
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型',
@@ -623,7 +623,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
"""
record = self.env['sf.functional.tool.assembly'].create({
'barcode_id': self.barcode_id.id,
'name': self.functional_tool_name_id.id,
'functional_tool_name_id': self.functional_tool_name_id.id,
'functional_tool_type_id': self.functional_tool_type_id.id,
'functional_tool_diameter': self.diameter,
'functional_tool_length': self.tool_loading_length,
@@ -664,7 +664,6 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
})
class FunctionalToolAssembly(models.Model):
_name = 'sf.functional.tool.assembly'
_description = '功能刀具组装单'
@@ -673,7 +672,7 @@ class FunctionalToolAssembly(models.Model):
assembly_order_code = fields.Char(string='编码', readonly=True)
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
name = fields.Char( string='功能刀具名称', readonly=True)
name = fields.Char(string='名称', readonly=True)
functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
group_expand='_read_group_functional_tool_type_ids')

5
sf_tool_management/wizard/wizard.py
View File

@@ -273,7 +273,6 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
stock_lot = self.create_assemble_warehouse_receipt()
# 创建刀具组装入库单
self.create_stocking_picking(stock_lot)
print('已运行1')
desc_1 = {
'barcode_id': stock_lot.id,
'integral_code_id': self.integral_code_id.id,
@@ -293,13 +292,11 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
'tool_loading_person': self.env.user.name,
'tool_loading_time': fields.Datetime.now()
}
print('已运行2')
functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([
('machine_tool_name_id', '=', self.machine_tool_name_id.id),
('cutter_spacing_code', '=', self.cutter_spacing_code),
('assemble_status', '=', '0'),
])
print('已运行3')
# 封装功能刀具数据
desc_2 = {
'barcode_id': stock_lot.id,
@@ -323,10 +320,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
'applicable_range': None,
'image': None,
}
print('已运行4')
# 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录
record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2)
print('已运行5')
self.env['sf.functional.tool.warning'].create({
'functional_cutting_tool_id': record_1.id,
'functional_tool_assembly_id': functional_tool_assembly.id,