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

Accept Merge Request #1924: (feature/制造功能优化 -> develop)

Browse Source 
Merge Request: 修正问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1924?initial=true
This commit is contained in:
马广威
2025-03-18 16:50:35 +08:00
committed by Coding
parent e4606ece75 c55231555c
commit f5bf727b34
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
quality_control/models/quality.py
View File

@@ -151,7 +151,7 @@ class QualityCheck(models.Model):
if record.picking_id: if record.picking_id:
total_qty = 0 total_qty = 0
for move in record.picking_id.move_ids_without_package: for move in record.picking_id.move_ids_without_package:
total_qty += move.product_uom_qty total_qty += int(move.product_uom_qty)
record.total_qty = total_qty if total_qty > 0 else '' record.total_qty = total_qty if total_qty > 0 else ''
else: else:
record.total_qty = '' record.total_qty = ''
@@ -373,9 +373,9 @@ class QualityCheck(models.Model):
raise UserError(_('请先输入检验数')) raise UserError(_('请先输入检验数'))
if not record.total_qty: if not record.total_qty:
raise UserError(_('总数量不能为空')) raise UserError(_('总数量不能为空'))
if record.check_qty <= float(record.total_qty): if record.check_qty >= int(record.total_qty):
raise UserError(_('检验数不可超过总数量')) raise UserError(_('检验数不可超过总数量'))
if record.column_nums >= record.check_qty: if record.column_nums <= record.check_qty:
raise UserError(_('测量件数不可超过检验数')) raise UserError(_('测量件数不可超过检验数'))
def do_cancel_publish(self): def do_cancel_publish(self):