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

调整名称及总数量逻辑

Browse Source
This commit is contained in:
mgw
2025-03-19 15:31:34 +08:00
parent a75e236f1f
commit 1a511b93cf
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quality_control/models/quality.py
View File

@@ -151,7 +151,8 @@ 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 += 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 '' record.total_qty = total_qty if total_qty > 0 else ''
else: else:
record.total_qty = '' record.total_qty = ''

14
sf_manufacturing/wizard/sale_order_cancel.py
View File

@@ -209,6 +209,16 @@ class SFSaleOrderCancelLine(models.TransientModel):
'finished': '已完成', 'finished': '已完成',
'cancel': '已取消'} 'cancel': '已取消'}
purchase_request_map_dict = {
'draft': '草稿',
'to_approve': '待批准',
'approved': '已批准',
'done': '已完成',
'cancel': '已取消',
'rejected': '已驳回',
'in_progress': '处理中'
}
module_name_dict = { module_name_dict = {
'purchase': '采购', 'purchase': '采购',
'quality': '质量', 'quality': '质量',
@@ -471,12 +481,12 @@ class SFSaleOrderCancelLine(models.TransientModel):
'wizard_id': wizard_id, 'wizard_id': wizard_id,
'sequence': sequence, 'sequence': sequence,
'category': module_name_dict[purchase_request_line._original_module], '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, 'doc_number': purchase_request_line.request_id.name,
'line_number': prl_count, 'line_number': prl_count,
'product_name': f'[{purchase_request_line.product_id.default_code}] {purchase_request_line.product_id.name}', 'product_name': f'[{purchase_request_line.product_id.default_code}] {purchase_request_line.product_id.name}',
'quantity': purchase_request_line.product_qty, '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 '' 'cancel_reason': '已有异动' if purchase_request_line.request_state not in ['draft', 'cancel'] else ''
} }
lines.append(self.create(vals)) lines.append(self.create(vals))