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

This commit is contained in:
mgw
2025-03-20 16:23:01 +08:00

View File

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