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

Accept Merge Request #857: (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/857?initial=true
This commit is contained in:
禹翔辉
2024-02-26 12:09:33 +08:00
committed by Coding
parent 30e7c616a2 a103f84635
commit 0b6f5db9ff
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sf_tool_management/models/tool_material_search.py
View File

@@ -321,10 +321,10 @@ class ToolMaterial(models.Model):
specification_id = fields.Many2one('sf.tool.materials.basic.parameters', '规格', specification_id = fields.Many2one('sf.tool.materials.basic.parameters', '规格',
related='product_id.specification_id') related='product_id.specification_id')
image = fields.Binary('图片', related='product_id.image_1920') image = fields.Binary('图片', related='product_id.image_1920')
number = fields.Integer('总数量', compute='_compute_number', store=True) number = fields.Integer('总数量', compute='_compute_number')
usable_num = fields.Integer('可用数量', compute='_compute_number', store=True) usable_num = fields.Integer('可用数量', compute='_compute_number')
have_been_used_num = fields.Integer('在用数量', compute='_compute_number', store=True) have_been_used_num = fields.Integer('在用数量', compute='_compute_number')
scrap_num = fields.Integer('报废数量', compute='_compute_number', store=True) scrap_num = fields.Integer('报废数量', compute='_compute_number')
barcode_ids = fields.One2many('stock.lot', 'tool_material_search_id', string='序列号', readonly=True) barcode_ids = fields.One2many('stock.lot', 'tool_material_search_id', string='序列号', readonly=True)
@@ -337,10 +337,11 @@ class ToolMaterial(models.Model):
if record.barcode_ids: if record.barcode_ids:
record.number = len(record.barcode_ids) record.number = len(record.barcode_ids)
for barcode_id in record.barcode_ids: for barcode_id in record.barcode_ids:
if barcode_id.quant_ids[-1].location_id.name == '刀具组装位置': if barcode_id.quant_ids:
have_been_used_num = have_been_used_num + 1 if barcode_id.quant_ids[-1].location_id.name == '刀具组装位置':
else: have_been_used_num = have_been_used_num + 1
usable_num = usable_num + 1 else:
usable_num = usable_num + 1
record.usable_num = usable_num record.usable_num = usable_num
record.have_been_used_num = have_been_used_num record.have_been_used_num = have_been_used_num
record.scrap_num = scrap_num record.scrap_num = scrap_num