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

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

Browse Source 
Merge Request: sf-坯料的获取方式是自加工，生成的坯料制造订单的排程单不在取消列表中

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1940?initial=true
This commit is contained in:
马广威
2025-03-20 16:21:05 +08:00
committed by Coding
parent b86d15c5cb ae1028972c
commit 9f3791bd6b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_manufacturing/wizard/sale_order_cancel.py
View File

@@ -332,7 +332,9 @@ class SFSaleOrderCancelLine(models.TransientModel):
p1 = 0 p1 = 0
for plan_order in sf_plan_orders: for plan_order in sf_plan_orders:
if not plan_order.product_id.default_code: if not plan_order.product_id.default_code:
continue product_name = plan_order.product_id.name
else:
product_name = f'[{plan_order.product_id.default_code}] {plan_order.product_id.name}'
p1 += 1 p1 += 1
vals = { vals = {
'wizard_id': wizard_id, 'wizard_id': wizard_id,
@@ -342,7 +344,7 @@ class SFSaleOrderCancelLine(models.TransientModel):
'operation_type': '', 'operation_type': '',
'doc_number': plan_order.name, 'doc_number': plan_order.name,
'line_number': p1, 'line_number': p1,
'product_name': f'[{plan_order.product_id.default_code}] {plan_order.product_id.name}', 'product_name': product_name,
'quantity': 1, 'quantity': 1,
'doc_state': plan_map_dict.get(plan_order.state, plan_order.state), 'doc_state': plan_map_dict.get(plan_order.state, plan_order.state),
'cancel_reason': '已有异动' if plan_order.state not in ['draft', 'cancel'] else '' 'cancel_reason': '已有异动' if plan_order.state not in ['draft', 'cancel'] else ''