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

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

Browse Source 
Merge Request: 调整判断逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1860?initial=true
This commit is contained in:
马广威
2025-02-26 10:41:42 +08:00
committed by Coding
parent 22b0b02168 e9226a87f5
commit e4c729e8e0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/wizard/sale_order_cancel.py
View File

@@ -288,7 +288,7 @@ class SFSaleOrderCancelLine(models.TransientModel):
is_changed = False is_changed = False
if picking.state not in ['draft', 'cancel', 'waiting']: if picking.state not in ['draft', 'cancel', 'waiting']:
is_changed = True is_changed = True
if picking.picking_type_id.name == '客供料入库' and picking.state not in ['cancel', 'assigned']: if picking.picking_type_id.name == '客供料入库' and picking.state in ['cancel', 'assigned']:
is_changed = False is_changed = False
vals = { vals = {
'wizard_id': wizard_id, 'wizard_id': wizard_id,