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/优化最新版返工

Browse Source 
# Conflicts:
#	sf_manufacturing/models/mrp_production.py
This commit is contained in:
jinling.yang
2024-07-16 17:25:24 +08:00
parent c536dde2cc 801ff9e076
commit 6c820ead44
5 changed files with 71 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/models/mrp_production.py
View File

@@ -137,7 +137,7 @@ class MrpProduction(models.Model):
wo.test_results == '返工' and wo.state == 'done' and production.programming_state == '已编程') or (
wo.state == 'rework' and production.programming_state == '编程中') or (
wo.is_rework is True and wo.state == 'done' and production.programming_state in ['编程中',
'已编程'])
'已编程'])
for wo in
production.workorder_ids):
production.state = 'rework'