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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched

Browse Source
This commit is contained in:
mgw
2025-03-19 15:44:21 +08:00
parent 0ff0cc5fbd db661e76f5
commit b89cfb899b
6 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sf_manufacturing/wizard/sale_order_cancel.py
View File

@@ -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))

2
sf_manufacturing/wizard/sale_order_cancel_views.xml
View File

@@ -13,7 +13,7 @@
<field name="display_message" readonly="1" nolabel="1"/>
</div>
<field name="related_docs" >
<tree string="下游单据" create="false" edit="false" delete="false" attrs="{'merge_fields': 'category,doc_name,operation_type,doc_number,doc_state, cancel_reason', 'merge_key': 'doc_number'}">
<tree string="下游单据" create="false" edit="false" delete="false" attrs="{'merge_fields': 'category,doc_name,operation_type,doc_number,doc_state,cancel_reason','merge_key': 'doc_number,category'}">
<!-- <field name="sequence" string="序号"/> -->
<field name="category" string="大类"/>
<field name="doc_name" string="单据名称"/>