diff --git a/quality_control/models/quality.py b/quality_control/models/quality.py index e7e8b196..8670005d 100644 --- a/quality_control/models/quality.py +++ b/quality_control/models/quality.py @@ -151,7 +151,8 @@ class QualityCheck(models.Model): if record.picking_id: total_qty = 0 for move in record.picking_id.move_ids_without_package: - total_qty += int(move.product_uom_qty) + if move.product_id == record.product_id: + total_qty = int(move.product_uom_qty) record.total_qty = total_qty if total_qty > 0 else '' else: record.total_qty = '' diff --git a/sf_manufacturing/wizard/sale_order_cancel.py b/sf_manufacturing/wizard/sale_order_cancel.py index eda8a0b8..3834bd8e 100644 --- a/sf_manufacturing/wizard/sale_order_cancel.py +++ b/sf_manufacturing/wizard/sale_order_cancel.py @@ -208,6 +208,16 @@ class SFSaleOrderCancelLine(models.TransientModel): 'processing': '加工中', 'finished': '已完成', 'cancel': '已取消'} + + purchase_request_map_dict = { + 'draft': '草稿', + 'to_approve': '待批准', + 'approved': '已批准', + 'done': '已完成', + 'cancel': '已取消', + 'rejected': '已驳回', + 'in_progress': '处理中' + } module_name_dict = { 'purchase': '采购', @@ -471,12 +481,12 @@ class SFSaleOrderCancelLine(models.TransientModel): 'wizard_id': wizard_id, 'sequence': sequence, 'category': module_name_dict[purchase_request_line._original_module], - 'doc_name': purchase_request_line._description, + 'doc_name': purchase_request_line.request_id._description, 'doc_number': purchase_request_line.request_id.name, 'line_number': prl_count, 'product_name': f'[{purchase_request_line.product_id.default_code}] {purchase_request_line.product_id.name}', 'quantity': purchase_request_line.product_qty, - 'doc_state': map_dict.get(purchase_request_line.request_state, purchase_request_line.request_state), + 'doc_state': purchase_request_map_dict.get(purchase_request_line.request_state, purchase_request_line.request_state), 'cancel_reason': '已有异动' if purchase_request_line.request_state not in ['draft', 'cancel'] else '' } lines.append(self.create(vals))