Merge branch 'feature/工单-质检优化_3' into feature/质检单优化

This commit is contained in:
yuxianghui
2025-01-14 16:22:59 +08:00

View File

@@ -1288,7 +1288,7 @@ class ResMrpWorkOrder(models.Model):
'test_results': record.test_results,
'test_report': record.detection_report})],
'is_scrap': True if record.test_results == '报废' else False,
'state': 'rework' if (record.routing_type != 'CNC加工' and record.test_results == '返工') else record.state
'state': 'rework' if (record.routing_type != 'CNC加工' and record.test_results == '返工') else record.production_id.state
})
if record.routing_type == '解除装夹':
'''