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

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

Browse Source 
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1706?initial=true
This commit is contained in:
马广威
2025-01-03 11:33:28 +08:00
committed by Coding
parent b483097907 c34cdd595d
commit 1ca8ebe3cc
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jikimo_purchase_tier_validation/models/models.py
View File

@@ -87,7 +87,17 @@ class jikimo_purchase_tier_validation(models.Model):
def _validate_tier(self, tiers=False): def _validate_tier(self, tiers=False):
res = super(jikimo_purchase_tier_validation, self)._validate_tier(tiers) res = super(jikimo_purchase_tier_validation, self)._validate_tier(tiers)
tier_reviews = tiers or self.review_ids
# 检查是否所有审批都已通过
all_approved = all(
tier_review.review_status == 'approved'
for tier_review in tier_reviews
)
if all_approved and tier_reviews: # 确保有审批记录
self.state = 'approved' self.state = 'approved'
return res return res
def _rejected_tier(self, tiers=False): def _rejected_tier(self, tiers=False):